diff --git a/components/ActionSheet/src/MDCActionSheetController.h b/components/ActionSheet/src/MDCActionSheetController.h index 6ac00bfc873..8fb8ee5b6df 100644 --- a/components/ActionSheet/src/MDCActionSheetController.h +++ b/components/ActionSheet/src/MDCActionSheetController.h @@ -38,8 +38,7 @@ in a sheet from the bottom. */ -__attribute__((objc_subclassing_restricted)) -@interface MDCActionSheetController : UIViewController +__attribute__((objc_subclassing_restricted)) @interface MDCActionSheetController : UIViewController /** Designated initializer to create and return a view controller for displaying an alert to the user. @@ -95,7 +94,7 @@ __attribute__((objc_subclassing_restricted)) The order of the actions in the array matches the order in which they were added to the action sheet. */ -@property (nonatomic, nonnull, readonly, copy) NSArray *actions; +@property(nonatomic, nonnull, readonly, copy) NSArray *actions; /** The title of the action sheet controller. @@ -103,14 +102,14 @@ __attribute__((objc_subclassing_restricted)) If this is updated after presentation the view will be updated to match the new value. */ -@property (nonatomic, nullable, copy) NSString *title; +@property(nonatomic, nullable, copy) NSString *title; /** The message of the action sheet controller. If this is updated after presentation the view will be updated to match the new value. */ -@property (nonatomic, nullable, copy) NSString *message; +@property(nonatomic, nullable, copy) NSString *message; /** Indicates whether the button should automatically update its font when the device’s @@ -204,7 +203,6 @@ typedef void (^MDCActionSheetHandler)(MDCActionSheetAction *_Nonnull action); */ @interface MDCActionSheetAction : NSObject - /** Returns an action sheet action with the populated given values. @@ -228,7 +226,7 @@ typedef void (^MDCActionSheetHandler)(MDCActionSheetAction *_Nonnull action); Action sheet actions must have a title that will be set within actionWithTitle:image:handler: method. */ -@property (nonatomic, nonnull, readonly) NSString *title; +@property(nonatomic, nonnull, readonly) NSString *title; /** Image of the list item shown on the action sheet. @@ -236,7 +234,7 @@ typedef void (^MDCActionSheetHandler)(MDCActionSheetAction *_Nonnull action); Action sheet actions must have an image that will be set within actionWithTitle:image:handler: method. */ -@property (nonatomic, nullable, readonly) UIImage *image; +@property(nonatomic, nullable, readonly) UIImage *image; /** The @c accessibilityIdentifier for the view associated with this action. diff --git a/components/ActionSheet/src/private/MDCActionSheetHeaderView.h b/components/ActionSheet/src/private/MDCActionSheetHeaderView.h index 83c90d0bd7e..6e29c139a3f 100644 --- a/components/ActionSheet/src/private/MDCActionSheetHeaderView.h +++ b/components/ActionSheet/src/private/MDCActionSheetHeaderView.h @@ -21,16 +21,16 @@ /** Header must be created with initWithFrame */ - (nullable instancetype)initWithCoder:(nonnull NSCoder *)aDecoder NS_UNAVAILABLE; -@property (nonatomic, nullable, copy) NSString *title; +@property(nonatomic, nullable, copy) NSString *title; -@property (nonatomic, nullable, copy) NSString *message; +@property(nonatomic, nullable, copy) NSString *message; @property(nonatomic, setter=mdc_setAdjustsFontForContentSizeCategory:) BOOL mdc_adjustsFontForContentSizeCategory; -@property (nonatomic, strong, nonnull) UIFont *titleFont; +@property(nonatomic, strong, nonnull) UIFont *titleFont; -@property (nonatomic, strong, nonnull) UIFont *messageFont; +@property(nonatomic, strong, nonnull) UIFont *messageFont; @property(nonatomic, strong, nullable) UIColor *titleTextColor; diff --git a/components/ActionSheet/src/private/MDCActionSheetItemTableViewCell.h b/components/ActionSheet/src/private/MDCActionSheetItemTableViewCell.h index cca221501b7..8c461bf28e7 100644 --- a/components/ActionSheet/src/private/MDCActionSheetItemTableViewCell.h +++ b/components/ActionSheet/src/private/MDCActionSheetItemTableViewCell.h @@ -15,6 +15,7 @@ #import #import #import "MDCActionSheetController.h" +#import "MaterialInk.h" @interface MDCActionSheetItemTableViewCell : UITableViewCell /** diff --git a/components/ActivityIndicator/src/MDCActivityIndicator.h b/components/ActivityIndicator/src/MDCActivityIndicator.h index b88de0c9846..071ace0351b 100644 --- a/components/ActivityIndicator/src/MDCActivityIndicator.h +++ b/components/ActivityIndicator/src/MDCActivityIndicator.h @@ -102,9 +102,9 @@ IB_DESIGNABLE /** The array of colors that are cycled through when animating the spinner. Populated with a set of - default colors. - - @note If an empty array is provided to this property's setter, then the provided array will be + default colors. + + @note If an empty array is provided to this property's setter, then the provided array will be discarded and an array consisting of the default color values will be assigned instead. */ @property(nonatomic, copy, nonnull) NSArray *cycleColors UI_APPEARANCE_SELECTOR; @@ -195,7 +195,7 @@ typedef void (^MDCActivityIndicatorAnimation)(CGFloat strokeStart, CGFloat strok - (nonnull instancetype)initWithCoder:(nonnull NSCoder *)aDecoder NS_UNAVAILABLE; -- (nonnull instancetype)initWithAnimation: - (_Nonnull MDCActivityIndicatorAnimation)animation NS_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithAnimation:(_Nonnull MDCActivityIndicatorAnimation)animation + NS_DESIGNATED_INITIALIZER; @end diff --git a/components/ActivityIndicator/src/private/MDCActivityIndicatorMotionSpec.h b/components/ActivityIndicator/src/private/MDCActivityIndicatorMotionSpec.h index 8d39f0e670e..01c0cb8052a 100644 --- a/components/ActivityIndicator/src/private/MDCActivityIndicatorMotionSpec.h +++ b/components/ActivityIndicator/src/private/MDCActivityIndicatorMotionSpec.h @@ -36,8 +36,7 @@ typedef struct MDCActivityIndicatorMotionSpecProgress { MDMMotionTiming strokeEnd; } MDCActivityIndicatorMotionSpecProgress; -__attribute__((objc_subclassing_restricted)) -@interface MDCActivityIndicatorMotionSpec: NSObject +__attribute__((objc_subclassing_restricted)) @interface MDCActivityIndicatorMotionSpec : NSObject @property(nonatomic, class, readonly) NSTimeInterval pointCycleDuration; @property(nonatomic, class, readonly) NSTimeInterval pointCycleMinimumVariableDuration; @@ -53,4 +52,3 @@ __attribute__((objc_subclassing_restricted)) - (instancetype)init NS_UNAVAILABLE; @end - diff --git a/components/ActivityIndicator/src/private/MaterialActivityIndicatorStrings_table.h b/components/ActivityIndicator/src/private/MaterialActivityIndicatorStrings_table.h index 5c6f798450a..ae546ee6bc6 100644 --- a/components/ActivityIndicator/src/private/MaterialActivityIndicatorStrings_table.h +++ b/components/ActivityIndicator/src/private/MaterialActivityIndicatorStrings_table.h @@ -9,10 +9,10 @@ // This table is to be indexed using the generated enum. static NSString *const kMaterialActivityIndicatorStringTable[] = { - @"MaterialActivityIndicatorInProgressAccessibilityValue", // In Progress - @"MaterialActivityIndicatorAccessibilityLabel", // Activity Indicator - @"MaterialActivityIndicatorProgressHaltedAccessibilityValue", // Progress Halted - @"MaterialActivityIndicatorProgressCompletedAccessibilityValue", // %ld Percent Complete + @"MaterialActivityIndicatorInProgressAccessibilityValue", // In Progress + @"MaterialActivityIndicatorAccessibilityLabel", // Activity Indicator + @"MaterialActivityIndicatorProgressHaltedAccessibilityValue", // Progress Halted + @"MaterialActivityIndicatorProgressCompletedAccessibilityValue", // %ld Percent Complete }; #define kNumMaterialActivityIndicatorStrings 4 #define kMaterialActivityIndicatorStringsOffset 0 diff --git a/components/AnimationTiming/src/CAMediaTimingFunction+MDCAnimationTiming.h b/components/AnimationTiming/src/CAMediaTimingFunction+MDCAnimationTiming.h index 06d8715e958..d7b717a9966 100644 --- a/components/AnimationTiming/src/CAMediaTimingFunction+MDCAnimationTiming.h +++ b/components/AnimationTiming/src/CAMediaTimingFunction+MDCAnimationTiming.h @@ -48,7 +48,7 @@ typedef NS_ENUM(NSUInteger, MDCAnimationTimingFunction) { faster than the standard curve since it doesn't follow an exact path to the off-screen point. */ MDCAnimationTimingFunctionSharp, - + /** Aliases for depreciated names */ diff --git a/components/AnimationTiming/src/UIView+MDCTimingFunction.h b/components/AnimationTiming/src/UIView+MDCTimingFunction.h index b9e493e26aa..ce503185cad 100644 --- a/components/AnimationTiming/src/UIView+MDCTimingFunction.h +++ b/components/AnimationTiming/src/UIView+MDCTimingFunction.h @@ -31,7 +31,7 @@ duration:(NSTimeInterval)duration delay:(NSTimeInterval)delay options:(UIViewAnimationOptions)options - animations:(void (^ __nonnull)(void))animations - completion:(void (^ __nullable)(BOOL finished))completion; + animations:(void (^__nonnull)(void))animations + completion:(void (^__nullable)(BOOL finished))completion; @end diff --git a/components/AppBar/src/ColorThemer/MDCAppBarColorThemer.h b/components/AppBar/src/ColorThemer/MDCAppBarColorThemer.h index 7ea83f8a97f..2d0f8e107c3 100644 --- a/components/AppBar/src/ColorThemer/MDCAppBarColorThemer.h +++ b/components/AppBar/src/ColorThemer/MDCAppBarColorThemer.h @@ -30,7 +30,7 @@ @param appBarViewController A component instance to which the color scheme should be applied. */ + (void)applyColorScheme:(nonnull id)colorScheme - toAppBarViewController:(nonnull MDCAppBarViewController *)appBarViewController; + toAppBarViewController:(nonnull MDCAppBarViewController *)appBarViewController; /** Applies a color scheme's properties to an MDCAppBarViewController instance using the surface diff --git a/components/AppBar/src/ColorThemer/MaterialAppBar+ColorThemer.h b/components/AppBar/src/ColorThemer/MaterialAppBar+ColorThemer.h index c2036abaf38..b46276436a4 100644 --- a/components/AppBar/src/ColorThemer/MaterialAppBar+ColorThemer.h +++ b/components/AppBar/src/ColorThemer/MaterialAppBar+ColorThemer.h @@ -13,4 +13,3 @@ // limitations under the License. #import "MDCAppBarColorThemer.h" - diff --git a/components/AppBar/src/MDCAppBarContainerViewController.h b/components/AppBar/src/MDCAppBarContainerViewController.h index 33e436b85c3..2188079ae91 100644 --- a/components/AppBar/src/MDCAppBarContainerViewController.h +++ b/components/AppBar/src/MDCAppBarContainerViewController.h @@ -45,7 +45,7 @@ Initializes an App Bar container view controller instance with the given content view controller. */ - (nonnull instancetype)initWithContentViewController: - (nonnull UIViewController *)contentViewController NS_DESIGNATED_INITIALIZER; + (nonnull UIViewController *)contentViewController NS_DESIGNATED_INITIALIZER; - (nonnull instancetype)initWithNibName:(nullable NSString *)nibNameOrNil bundle:(nullable NSBundle *)nibBundleOrNil NS_UNAVAILABLE; @@ -97,4 +97,3 @@ @property(nonatomic, strong, nonnull, readonly) MDCAppBar *appBar; @end - diff --git a/components/AppBar/src/MDCAppBarNavigationController.h b/components/AppBar/src/MDCAppBarNavigationController.h index f3987863819..0af8b87b964 100644 --- a/components/AppBar/src/MDCAppBarNavigationController.h +++ b/components/AppBar/src/MDCAppBarNavigationController.h @@ -58,7 +58,8 @@ @warning This method will soon be deprecated. Please use -appBarNavigationController:willAddAppBarViewController:asChildOfViewController: instead. Learn - more at https://github.com/material-components/material-components-ios/blob/develop/components/AppBar/docs/migration-guide-appbar-appbarviewcontroller.md + more at + https://github.com/material-components/material-components-ios/blob/develop/components/AppBar/docs/migration-guide-appbar-appbarviewcontroller.md */ - (void)appBarNavigationController:(nonnull MDCAppBarNavigationController *)navigationController willAddAppBar:(nonnull MDCAppBar *)appBar @@ -80,8 +81,8 @@ delegate yet. In this case, use the -appBarForViewController: API to retrieve the injected App Bar for your root view controller and execute your delegate logic on the returned result, if any. */ -__attribute__((objc_subclassing_restricted)) -@interface MDCAppBarNavigationController : UINavigationController +__attribute__((objc_subclassing_restricted)) @interface MDCAppBarNavigationController + : UINavigationController #pragma mark - Reacting to state changes @@ -107,9 +108,9 @@ __attribute__((objc_subclassing_restricted)) Returns the injected App Bar for a given view controller, if an App Bar was injected. @warning This method will eventually be deprecated. Use -appBarViewControllerForViewController: - instead. Learn more at https://github.com/material-components/material-components-ios/blob/develop/components/AppBar/docs/migration-guide-appbar-appbarviewcontroller.md + instead. Learn more at + https://github.com/material-components/material-components-ios/blob/develop/components/AppBar/docs/migration-guide-appbar-appbarviewcontroller.md */ - (nullable MDCAppBar *)appBarForViewController:(nonnull UIViewController *)viewController; @end - diff --git a/components/AppBar/src/MaterialAppBar.h b/components/AppBar/src/MaterialAppBar.h index 76eb9d7e9b2..52fa9aa4aad 100644 --- a/components/AppBar/src/MaterialAppBar.h +++ b/components/AppBar/src/MaterialAppBar.h @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "MDCAppBarViewController.h" #import "MDCAppBarContainerViewController.h" #import "MDCAppBarNavigationController.h" +#import "MDCAppBarViewController.h" #pragma mark - To be deprecated diff --git a/components/AppBar/src/private/MaterialAppBarStrings_table.h b/components/AppBar/src/private/MaterialAppBarStrings_table.h index ec80a51b951..76f02c153ef 100644 --- a/components/AppBar/src/private/MaterialAppBarStrings_table.h +++ b/components/AppBar/src/private/MaterialAppBarStrings_table.h @@ -23,7 +23,7 @@ // This table is to be indexed using the generated enum. static NSString *const kMaterialAppBarStringTable[] = { - @"MaterialAppBarBackButtonAccessibilityLabel", // Back + @"MaterialAppBarBackButtonAccessibilityLabel", // Back }; #define kNumMaterialAppBarStrings 1 #define kMaterialAppBarStringsOffset 0 diff --git a/components/BottomAppBar/src/MDCBottomAppBarView.h b/components/BottomAppBar/src/MDCBottomAppBarView.h index 43dfd7edc14..0cc653dd1b8 100644 --- a/components/BottomAppBar/src/MDCBottomAppBarView.h +++ b/components/BottomAppBar/src/MDCBottomAppBarView.h @@ -31,7 +31,7 @@ typedef NS_ENUM(NSInteger, MDCBottomAppBarFloatingButtonPosition) { /** A bottom app bar view with an embedded floating button. - + The bottom app bar is a bar docked at the bottom of the screen. A floating action button is provided for a primary action. */ @@ -106,7 +106,7 @@ typedef NS_ENUM(NSInteger, MDCBottomAppBarFloatingButtonPosition) { /** Sets the visibility of the floating action button. - + @param animated Enable or disable animation. */ - (void)setFloatingButtonHidden:(BOOL)floatingButtonHidden animated:(BOOL)animated; @@ -123,7 +123,7 @@ typedef NS_ENUM(NSInteger, MDCBottomAppBarFloatingButtonPosition) { /** Sets the position of the floating action button. Note, if the set position is the same as the current position there is no change in the position nor animation. - + @param animated Enable or disable animation. */ - (void)setFloatingButtonPosition:(MDCBottomAppBarFloatingButtonPosition)floatingButtonPosition diff --git a/components/BottomNavigation/src/ColorThemer/MDCBottomNavigationBarColorThemer.h b/components/BottomNavigation/src/ColorThemer/MDCBottomNavigationBarColorThemer.h index b80c9e7cee6..71fa538a139 100644 --- a/components/BottomNavigation/src/ColorThemer/MDCBottomNavigationBarColorThemer.h +++ b/components/BottomNavigation/src/ColorThemer/MDCBottomNavigationBarColorThemer.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "MaterialColorScheme.h" #import "MaterialBottomNavigation.h" +#import "MaterialColorScheme.h" /** The Material Design color system's themer for instances of MDCBottomNavigationBar. diff --git a/components/BottomNavigation/src/MDCBottomNavigationBar.h b/components/BottomNavigation/src/MDCBottomNavigationBar.h index 3b48fb1fc04..d6529274b1c 100644 --- a/components/BottomNavigation/src/MDCBottomNavigationBar.h +++ b/components/BottomNavigation/src/MDCBottomNavigationBar.h @@ -66,8 +66,8 @@ typedef NS_ENUM(NSInteger, MDCBottomNavigationBarAlignment) { Configures when item titles should be displayed. Default is MDCBottomNavigationBarTitleVisibilitySelected. */ -@property(nonatomic, assign) MDCBottomNavigationBarTitleVisibility titleVisibility - UI_APPEARANCE_SELECTOR; +@property(nonatomic, assign) + MDCBottomNavigationBarTitleVisibility titleVisibility UI_APPEARANCE_SELECTOR; /** Configures item space distribution and title orientation in landscape mode. @@ -98,8 +98,8 @@ typedef NS_ENUM(NSInteger, MDCBottomNavigationBarAlignment) { Color of selected item. Applies color to items' icons and text. If set also sets selectedItemTitleColor. Default color is black. */ -@property (nonatomic, strong, readwrite, nonnull) UIColor *selectedItemTintColor - UI_APPEARANCE_SELECTOR; +@property(nonatomic, strong, readwrite, nonnull) + UIColor *selectedItemTintColor UI_APPEARANCE_SELECTOR; /** Color of the selected item's title text. Default color is black. @@ -110,8 +110,8 @@ typedef NS_ENUM(NSInteger, MDCBottomNavigationBarAlignment) { Color of unselected items. Applies color to items' icons. Text is not displayed in unselected mode. Default color is dark gray. */ -@property (nonatomic, strong, readwrite, nonnull) UIColor *unselectedItemTintColor - UI_APPEARANCE_SELECTOR; +@property(nonatomic, strong, readwrite, nonnull) + UIColor *unselectedItemTintColor UI_APPEARANCE_SELECTOR; /** Color of the background of bottom navigation bar and the bar items. @@ -121,7 +121,7 @@ typedef NS_ENUM(NSInteger, MDCBottomNavigationBarAlignment) { /** To color the background of the view use -barTintColor instead. */ -@property(nullable, nonatomic,copy) UIColor *backgroundColor UI_APPEARANCE_SELECTOR; +@property(nullable, nonatomic, copy) UIColor *backgroundColor UI_APPEARANCE_SELECTOR; /** The inset applied to each items bounds to determine the rect in which the items' contents will be diff --git a/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.h b/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.h index 7b5c755056b..4e5552b8aff 100644 --- a/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.h +++ b/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import #import +#import @interface MDCBottomNavigationItemBadge : UIView diff --git a/components/BottomNavigation/src/private/MaterialBottomNavigationStrings_table.h b/components/BottomNavigation/src/private/MaterialBottomNavigationStrings_table.h index b1243e9b313..cfd02cc4f6c 100644 --- a/components/BottomNavigation/src/private/MaterialBottomNavigationStrings_table.h +++ b/components/BottomNavigation/src/private/MaterialBottomNavigationStrings_table.h @@ -18,11 +18,10 @@ // This table is to be indexed using the generated enum. static NSString *const kMaterialBottomNavigationStringTable[] = { - @"MaterialBottomNavigationItemCountAccessibilityHint", - @"MaterialBottomNavigationTabElementAccessibilityLabel", + @"MaterialBottomNavigationItemCountAccessibilityHint", + @"MaterialBottomNavigationTabElementAccessibilityLabel", }; #define kNumMaterialBottomNavigationStrings 1 #define kMaterialBottomNavigationStringsOffset 0 #define kMaterialBottomNavigationStringsEnd 10000 static NSString *const kMaterialBottomNavigationStringsTableName = @"MaterialBottomNavigation"; - diff --git a/components/BottomSheet/examples/supplemental/BottomSheetDummyCollectionViewController.h b/components/BottomSheet/examples/supplemental/BottomSheetDummyCollectionViewController.h index 71cd3fd78e9..78c25d65fab 100644 --- a/components/BottomSheet/examples/supplemental/BottomSheetDummyCollectionViewController.h +++ b/components/BottomSheet/examples/supplemental/BottomSheetDummyCollectionViewController.h @@ -18,6 +18,6 @@ - (instancetype)initWithNumItems:(NSInteger)numItems NS_DESIGNATED_INITIALIZER; - (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout NS_UNAVAILABLE; - (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE; -- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -NS_UNAVAILABLE; +- (instancetype)initWithNibName:(NSString *)nibNameOrNil + bundle:(NSBundle *)nibBundleOrNil NS_UNAVAILABLE; @end diff --git a/components/BottomSheet/examples/supplemental/BottomSheetDummyStaticViewController.h b/components/BottomSheet/examples/supplemental/BottomSheetDummyStaticViewController.h index 171d8fdb900..62c0dbcd3fd 100644 --- a/components/BottomSheet/examples/supplemental/BottomSheetDummyStaticViewController.h +++ b/components/BottomSheet/examples/supplemental/BottomSheetDummyStaticViewController.h @@ -18,7 +18,7 @@ - (instancetype)init NS_DESIGNATED_INITIALIZER; - (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE; -- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil - NS_UNAVAILABLE; +- (instancetype)initWithNibName:(NSString *)nibNameOrNil + bundle:(NSBundle *)nibBundleOrNil NS_UNAVAILABLE; @end diff --git a/components/BottomSheet/src/MDCSheetState.h b/components/BottomSheet/src/MDCSheetState.h index 9900e35983f..99613d9e6e2 100644 --- a/components/BottomSheet/src/MDCSheetState.h +++ b/components/BottomSheet/src/MDCSheetState.h @@ -14,7 +14,6 @@ #import - /** The MDCSheetState enum provides the different possible states the bottom sheet can be in. There are currently 3 different states for the bottom sheet: @@ -30,4 +29,3 @@ typedef NS_ENUM(NSUInteger, MDCSheetState) { MDCSheetStatePreferred, MDCSheetStateExtended }; - diff --git a/components/BottomSheet/src/private/MDCDraggableView.h b/components/BottomSheet/src/private/MDCDraggableView.h index b983778b1d8..cd5760f8648 100644 --- a/components/BottomSheet/src/private/MDCDraggableView.h +++ b/components/BottomSheet/src/private/MDCDraggableView.h @@ -26,7 +26,7 @@ /** * Delegate for handling drag events. */ -@property(nonatomic, weak, nullable) id delegate; +@property(nonatomic, weak, nullable) id delegate; /** * Initializes a MDCDraggableView. diff --git a/components/BottomSheet/src/private/MDCSheetBehavior.h b/components/BottomSheet/src/private/MDCSheetBehavior.h index 9e5944d57ec..ceaa4b721bc 100644 --- a/components/BottomSheet/src/private/MDCSheetBehavior.h +++ b/components/BottomSheet/src/private/MDCSheetBehavior.h @@ -30,7 +30,7 @@ * Initializes a @c MDCSheetBehavior. * @param item The dynamic item (a view) to apply the sheet behavior to. */ -- (nonnull instancetype)initWithItem:(nonnull id )item NS_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithItem:(nonnull id)item NS_DESIGNATED_INITIALIZER; - (nonnull instancetype)init NS_UNAVAILABLE; diff --git a/components/ButtonBar/src/MDCButtonBarButton.h b/components/ButtonBar/src/MDCButtonBarButton.h index e494cc532df..9cc2be16a4a 100644 --- a/components/ButtonBar/src/MDCButtonBarButton.h +++ b/components/ButtonBar/src/MDCButtonBarButton.h @@ -27,7 +27,6 @@ @param font The font. @param state The state. */ -- (void)setTitleFont:(nullable UIFont *)font forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setTitleFont:(nullable UIFont *)font forState:(UIControlState)state UI_APPEARANCE_SELECTOR; @end diff --git a/components/Buttons/src/ButtonThemer/MDCContainedButtonThemer.h b/components/Buttons/src/ButtonThemer/MDCContainedButtonThemer.h index 30ad5847f0f..f1b1a178366 100644 --- a/components/Buttons/src/ButtonThemer/MDCContainedButtonThemer.h +++ b/components/Buttons/src/ButtonThemer/MDCContainedButtonThemer.h @@ -29,7 +29,6 @@ @param scheme The button scheme to apply to the component instance. @param button A component instance to which the scheme should be applied. */ -+ (void)applyScheme:(nonnull id)scheme - toButton:(nonnull MDCButton *)button; ++ (void)applyScheme:(nonnull id)scheme toButton:(nonnull MDCButton *)button; @end diff --git a/components/Buttons/src/ButtonThemer/MDCOutlinedButtonThemer.h b/components/Buttons/src/ButtonThemer/MDCOutlinedButtonThemer.h index d378ff6add5..4e07e788556 100644 --- a/components/Buttons/src/ButtonThemer/MDCOutlinedButtonThemer.h +++ b/components/Buttons/src/ButtonThemer/MDCOutlinedButtonThemer.h @@ -27,6 +27,5 @@ @param scheme The button scheme to apply to the component instance. @param button A component instance to which the scheme should be applied. */ -+ (void)applyScheme:(nonnull id)scheme - toButton:(nonnull MDCButton *)button; ++ (void)applyScheme:(nonnull id)scheme toButton:(nonnull MDCButton *)button; @end diff --git a/components/Buttons/src/ButtonThemer/MDCTextButtonThemer.h b/components/Buttons/src/ButtonThemer/MDCTextButtonThemer.h index ff9a90e9c21..28916f1fd9b 100644 --- a/components/Buttons/src/ButtonThemer/MDCTextButtonThemer.h +++ b/components/Buttons/src/ButtonThemer/MDCTextButtonThemer.h @@ -29,7 +29,6 @@ @param scheme The button scheme to apply to the component instance. @param button A component instance to which the scheme should be applied. */ -+ (void)applyScheme:(nonnull id)scheme - toButton:(nonnull MDCButton *)button; ++ (void)applyScheme:(nonnull id)scheme toButton:(nonnull MDCButton *)button; @end diff --git a/components/Buttons/src/ButtonThemer/MaterialButtons+ButtonThemer.h b/components/Buttons/src/ButtonThemer/MaterialButtons+ButtonThemer.h index c85abb3c550..80da1865791 100644 --- a/components/Buttons/src/ButtonThemer/MaterialButtons+ButtonThemer.h +++ b/components/Buttons/src/ButtonThemer/MaterialButtons+ButtonThemer.h @@ -15,5 +15,5 @@ #import "MDCButtonScheme.h" #import "MDCContainedButtonThemer.h" #import "MDCFloatingActionButtonThemer.h" -#import "MDCTextButtonThemer.h" #import "MDCOutlinedButtonThemer.h" +#import "MDCTextButtonThemer.h" diff --git a/components/Buttons/src/ColorThemer/MaterialButtons+ColorThemer.h b/components/Buttons/src/ColorThemer/MaterialButtons+ColorThemer.h index 6571a4378e4..66aeec564b7 100644 --- a/components/Buttons/src/ColorThemer/MaterialButtons+ColorThemer.h +++ b/components/Buttons/src/ColorThemer/MaterialButtons+ColorThemer.h @@ -15,5 +15,5 @@ #import "MDCButtonColorThemer.h" #import "MDCContainedButtonColorThemer.h" #import "MDCFloatingButtonColorThemer.h" -#import "MDCTextButtonColorThemer.h" #import "MDCOutlinedButtonColorThemer.h" +#import "MDCTextButtonColorThemer.h" diff --git a/components/Buttons/src/MDCButton.h b/components/Buttons/src/MDCButton.h index 5d0aba4d6ad..33124772e9e 100644 --- a/components/Buttons/src/MDCButton.h +++ b/components/Buttons/src/MDCButton.h @@ -88,7 +88,6 @@ */ @property(nonatomic, assign) CGSize maximumSize UI_APPEARANCE_SELECTOR; - /** The apparent background color as seen by the user, i.e. the color of the view behind the button. @@ -148,8 +147,8 @@ @param backgroundColor The background color. @param state The state. */ -- (void)setBackgroundColor:(nullable UIColor *)backgroundColor forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setBackgroundColor:(nullable UIColor *)backgroundColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /* Convenience for `setBackgroundColor:backgroundColor forState:UIControlStateNormal`. */ - (void)setBackgroundColor:(nullable UIColor *)backgroundColor; @@ -170,8 +169,7 @@ @param font The font. @param state The state. */ -- (void)setTitleFont:(nullable UIFont *)font forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setTitleFont:(nullable UIFont *)font forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /** Sets the enabled state with optional animation. */ - (void)setEnabled:(BOOL)enabled animated:(BOOL)animated; @@ -209,8 +207,8 @@ @param borderColor The border color to set. @param state The state to set. */ -- (void)setBorderColor:(nullable UIColor *)borderColor forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setBorderColor:(nullable UIColor *)borderColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /** A color used as the button's imageView tint color @c imageTintColor for @c state. @@ -233,7 +231,6 @@ */ - (void)setImageTintColor:(nullable UIColor *)imageTintColor forState:(UIControlState)state; - /** The value set for the button's @c borderWidth for @c state. @@ -302,8 +299,9 @@ /** This property sets/gets the title color for UIControlStateNormal. */ -@property(nonatomic, strong, nullable) UIColor *customTitleColor UI_APPEARANCE_SELECTOR - __deprecated_msg("Use setTitleColor:forState: instead"); +@property(nonatomic, strong, nullable) + UIColor *customTitleColor UI_APPEARANCE_SELECTOR __deprecated_msg( + "Use setTitleColor:forState: instead"); @property(nonatomic) BOOL shouldRaiseOnTouch __deprecated_msg("Use MDCFlatButton instead of shouldRaiseOnTouch = NO") diff --git a/components/Buttons/src/MDCButton.m b/components/Buttons/src/MDCButton.m index 6197af503fe..f8acc4c6619 100644 --- a/components/Buttons/src/MDCButton.m +++ b/components/Buttons/src/MDCButton.m @@ -275,9 +275,7 @@ - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event { NSLog( @"Button touch target does not meet minimum size guidlines of (%0.f, %0.f). Button: %@, " @"Touch Target: %@", - MDCButtonMinimumTouchTargetWidth, - MDCButtonMinimumTouchTargetHeight, - [self description], + MDCButtonMinimumTouchTargetWidth, MDCButtonMinimumTouchTargetHeight, [self description], NSStringFromCGSize(CGSizeMake(width, height))); }); } @@ -569,7 +567,6 @@ - (void)setBackgroundColor:(UIColor *)backgroundColor forState:(UIControlState)s #pragma mark - Image Tint Color - (nullable UIColor *)imageTintColorForState:(UIControlState)state { - return _imageTintColors[@(state)] ?: _imageTintColors[@(UIControlStateNormal)]; } @@ -806,8 +803,7 @@ - (void)updateTitleFont { if (_mdc_adjustsFontForContentSizeCategory) { // Dynamic type is enabled so apply scaling - font = [font mdc_fontSizedForMaterialTextStyle:MDCFontTextStyleButton - scaledForDynamicType:YES]; + font = [font mdc_fontSizedForMaterialTextStyle:MDCFontTextStyleButton scaledForDynamicType:YES]; } self.titleLabel.font = font; diff --git a/components/Buttons/src/MDCFloatingButton+Animation.h b/components/Buttons/src/MDCFloatingButton+Animation.h index 7aee59f6fa3..5b9c53d1689 100644 --- a/components/Buttons/src/MDCFloatingButton+Animation.h +++ b/components/Buttons/src/MDCFloatingButton+Animation.h @@ -21,7 +21,7 @@ @param animated YES if the size change should be animated. @param completion a completion block to call after the size change is complete. - + @note This method will modify the transform property of the button. Apple's documentation about UIView frames and transforms states that whenever the transform is not the identity transform, the frame is undefined and should be ignored. diff --git a/components/Buttons/src/MDCFloatingButton.h b/components/Buttons/src/MDCFloatingButton.h index 6d5b3e9197c..c604dc3f98d 100644 --- a/components/Buttons/src/MDCFloatingButton.h +++ b/components/Buttons/src/MDCFloatingButton.h @@ -69,7 +69,6 @@ typedef NS_ENUM(NSInteger, MDCFloatingButtonImageLocation) { */ @interface MDCFloatingButton : MDCButton - /** The mode of the floating button can either be .normal (a circle) or .expanded (a pill-shaped rounded rectangle). In the @c .normal mode, the button should have either an image or a title, diff --git a/components/Buttons/src/MaterialButtons.h b/components/Buttons/src/MaterialButtons.h index 9197c50e602..b9879fdbdcb 100644 --- a/components/Buttons/src/MaterialButtons.h +++ b/components/Buttons/src/MaterialButtons.h @@ -14,6 +14,6 @@ #import "MDCButton.h" #import "MDCFlatButton.h" -#import "MDCFloatingButton.h" #import "MDCFloatingButton+Animation.h" +#import "MDCFloatingButton.h" #import "MDCRaisedButton.h" diff --git a/components/Buttons/src/private/MDCButton+Subclassing.h b/components/Buttons/src/private/MDCButton+Subclassing.h index 385d4d7262f..a386ede5e82 100644 --- a/components/Buttons/src/private/MDCButton+Subclassing.h +++ b/components/Buttons/src/private/MDCButton+Subclassing.h @@ -41,7 +41,7 @@ Previously used to set the corner radius of the button. This has been deprecated and the layer's |cornerRadius| property should be set directly. */ -- (CGFloat)cornerRadius __deprecated_msg("Set layer.cornerRadius explicitly"); +- (CGFloat)cornerRadius __deprecated_msg("Set layer.cornerRadius explicitly"); /** The default content edge insets of the button. They are set at initialization time. */ - (UIEdgeInsets)defaultContentEdgeInsets; diff --git a/components/Buttons/tests/unit/supplemental/ButtonTestView.h b/components/Buttons/tests/unit/supplemental/ButtonTestView.h index 6fe70a6c9b8..3a46d5d113d 100644 --- a/components/Buttons/tests/unit/supplemental/ButtonTestView.h +++ b/components/Buttons/tests/unit/supplemental/ButtonTestView.h @@ -17,6 +17,6 @@ #import "MaterialButtons.h" @interface ButtonTestView : UIView -@property (unsafe_unretained, nonatomic) IBOutlet MDCButton *button; +@property(unsafe_unretained, nonatomic) IBOutlet MDCButton *button; - (instancetype)initFromNib; @end diff --git a/components/Cards/src/CardThemer/MDCCardScheme.h b/components/Cards/src/CardThemer/MDCCardScheme.h index 8b331120a43..2667c5cd754 100644 --- a/components/Cards/src/CardThemer/MDCCardScheme.h +++ b/components/Cards/src/CardThemer/MDCCardScheme.h @@ -22,7 +22,7 @@ @protocol MDCCardScheming /** The color scheme to apply to cards. */ -@property(nonnull, readonly, nonatomic) id colorScheme; +@property(nonnull, readonly, nonatomic) id colorScheme; /** The shape scheme to apply to cards. */ @property(nonnull, readonly, nonatomic) id shapeScheme; @@ -37,4 +37,3 @@ @property(nonnull, readwrite, nonatomic) MDCShapeScheme *shapeScheme; @end - diff --git a/components/Cards/src/CardThemer/MDCCardThemer.h b/components/Cards/src/CardThemer/MDCCardThemer.h index 699a3576455..209fd1c10c1 100644 --- a/components/Cards/src/CardThemer/MDCCardThemer.h +++ b/components/Cards/src/CardThemer/MDCCardThemer.h @@ -23,16 +23,15 @@ /** Applies the material card style using the card scheme data. - + @param scheme The card style data that should be used to change the @c card. @param card A MDCCard instance to apply the @c scheme */ -+ (void)applyScheme:(nonnull id)scheme - toCard:(nonnull MDCCard *)card; ++ (void)applyScheme:(nonnull id)scheme toCard:(nonnull MDCCard *)card; /** Applies the material card style using the card scheme data. - + @param scheme The card style data that should be used to change the @c card. @param cardCell A MDCCardCollectionCell instance to apply the @c scheme */ @@ -41,7 +40,7 @@ /** Applies the material outlined card style using the card scheme data. - + @param scheme The card style data that should be used to change the @c card. @param card A MDCCard instance to apply the @c scheme */ @@ -50,7 +49,7 @@ /** Applies the material outlined card style using the card scheme data. - + @param scheme The card style data that should be used to change the @c card. @param cardCell A MDCCardCollectionCell instance to apply the @c scheme */ @@ -58,4 +57,3 @@ toCardCell:(nonnull MDCCardCollectionCell *)cardCell; @end - diff --git a/components/Cards/src/CardThemer/MaterialCards+CardThemer.h b/components/Cards/src/CardThemer/MaterialCards+CardThemer.h index c22cc065c34..124526b4645 100644 --- a/components/Cards/src/CardThemer/MaterialCards+CardThemer.h +++ b/components/Cards/src/CardThemer/MaterialCards+CardThemer.h @@ -14,5 +14,3 @@ #import "MDCCardScheme.h" #import "MDCCardThemer.h" - - diff --git a/components/Cards/src/MDCCard.h b/components/Cards/src/MDCCard.h index 0d74625ad46..8c1d77c36ef 100644 --- a/components/Cards/src/MDCCard.h +++ b/components/Cards/src/MDCCard.h @@ -43,7 +43,7 @@ Therefore, this property should be set to NO *only if* there are other interactable items within the card's content, such as buttons or other tappable controls. */ -@property (nonatomic, getter=isInteractable) IBInspectable BOOL interactable; +@property(nonatomic, getter=isInteractable) IBInspectable BOOL interactable; /** Sets the shadow elevation for an UIControlState state @@ -51,8 +51,8 @@ @param shadowElevation The shadow elevation @param state UIControlState the card state */ -- (void)setShadowElevation:(MDCShadowElevation)shadowElevation forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setShadowElevation:(MDCShadowElevation)shadowElevation + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /** Returns the shadow elevation for an UIControlState state @@ -72,8 +72,7 @@ @param borderWidth The border width @param state UIControlState the card state */ -- (void)setBorderWidth:(CGFloat)borderWidth forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setBorderWidth:(CGFloat)borderWidth forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /** Returns the border width for an UIControlState state @@ -92,8 +91,8 @@ @param borderColor The border color @param state UIControlState the card state */ -- (void)setBorderColor:(nullable UIColor *)borderColor forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setBorderColor:(nullable UIColor *)borderColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /** Returns the border color for an UIControlState state @@ -112,8 +111,8 @@ @param shadowColor The shadow color @param state UIControlState the card state */ -- (void)setShadowColor:(nullable UIColor *)shadowColor forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setShadowColor:(nullable UIColor *)shadowColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /** Returns the shadow color for an UIControlState state @@ -134,10 +133,9 @@ When the shapeGenerator is nil, MDCCard will use the default underlying layer with its default settings. - + Default value for shapeGenerator is nil. */ @property(nullable, nonatomic, strong) id shapeGenerator; - @end diff --git a/components/Cards/src/MDCCardCollectionCell.h b/components/Cards/src/MDCCardCollectionCell.h index 10491ca7c7d..df4f56ed34f 100644 --- a/components/Cards/src/MDCCardCollectionCell.h +++ b/components/Cards/src/MDCCardCollectionCell.h @@ -32,7 +32,7 @@ typedef NS_ENUM(NSInteger, MDCCardCellState) { /** The visual state when the cell is in its highlighted state. */ MDCCardCellStateHighlighted, - + /** The visual state when the cell has been selected. */ MDCCardCellStateSelected }; @@ -49,8 +49,8 @@ typedef NS_ENUM(NSInteger, MDCCardCellHorizontalImageAlignment) { /** The alignment of the image is to the left of the card. */ MDCCardCellHorizontalImageAlignmentLeft, - - // TODO: Add AlignmentLeading and AlignmentTrailing. See Github issue #3045 + + // TODO: Add AlignmentLeading and AlignmentTrailing. See Github issue #3045 }; /** @@ -100,7 +100,7 @@ typedef NS_ENUM(NSInteger, MDCCardCellVerticalImageAlignment) { Therefore, this property should be set to NO *only if* there are other interactable items within the card's content, such as buttons or other tappable controls. */ -@property (nonatomic, getter=isInteractable) IBInspectable BOOL interactable; +@property(nonatomic, getter=isInteractable) IBInspectable BOOL interactable; /* The shape generator used to define the card cell's shape. @@ -121,8 +121,8 @@ typedef NS_ENUM(NSInteger, MDCCardCellVerticalImageAlignment) { @param shadowElevation The shadow elevation @param state MDCCardCellState the card state */ -- (void)setShadowElevation:(MDCShadowElevation)shadowElevation forState:(MDCCardCellState)state - UI_APPEARANCE_SELECTOR; +- (void)setShadowElevation:(MDCShadowElevation)shadowElevation + forState:(MDCCardCellState)state UI_APPEARANCE_SELECTOR; /** Returns the shadow elevation for an MDCCardViewState state @@ -143,8 +143,7 @@ typedef NS_ENUM(NSInteger, MDCCardCellVerticalImageAlignment) { @param borderWidth The border width @param state MDCCardCellState the card state */ -- (void)setBorderWidth:(CGFloat)borderWidth forState:(MDCCardCellState)state - UI_APPEARANCE_SELECTOR; +- (void)setBorderWidth:(CGFloat)borderWidth forState:(MDCCardCellState)state UI_APPEARANCE_SELECTOR; /** Returns the border width for an MDCCardCellState state @@ -163,8 +162,8 @@ typedef NS_ENUM(NSInteger, MDCCardCellVerticalImageAlignment) { @param borderColor The border color @param state MDCCardCellState the card state */ -- (void)setBorderColor:(nullable UIColor *)borderColor forState:(MDCCardCellState)state - UI_APPEARANCE_SELECTOR; +- (void)setBorderColor:(nullable UIColor *)borderColor + forState:(MDCCardCellState)state UI_APPEARANCE_SELECTOR; /** Returns the border color for an MDCCardCellStateNormal state @@ -183,8 +182,8 @@ typedef NS_ENUM(NSInteger, MDCCardCellVerticalImageAlignment) { @param shadowColor The shadow color @param state MDCCardCellState the card state */ -- (void)setShadowColor:(nullable UIColor *)shadowColor forState:(MDCCardCellState)state - UI_APPEARANCE_SELECTOR; +- (void)setShadowColor:(nullable UIColor *)shadowColor + forState:(MDCCardCellState)state UI_APPEARANCE_SELECTOR; /** Returns the shadow color for an MDCCardCellStateNormal state @@ -217,8 +216,7 @@ typedef NS_ENUM(NSInteger, MDCCardCellVerticalImageAlignment) { @param image The image @param state MDCCardCellState the card state */ -- (void)setImage:(nullable UIImage *)image forState:(MDCCardCellState)state -UI_APPEARANCE_SELECTOR; +- (void)setImage:(nullable UIImage *)image forState:(MDCCardCellState)state UI_APPEARANCE_SELECTOR; /** Returns the horizontal image alignment for an MDCCardCellStateNormal state @@ -285,8 +283,8 @@ UI_APPEARANCE_SELECTOR; @param imageTintColor The image tint color @param state MDCCardCellState the card state */ -- (void)setImageTintColor:(nullable UIColor *)imageTintColor forState:(MDCCardCellState)state -UI_APPEARANCE_SELECTOR; +- (void)setImageTintColor:(nullable UIColor *)imageTintColor + forState:(MDCCardCellState)state UI_APPEARANCE_SELECTOR; /** The state of the card cell. diff --git a/components/Cards/src/MaterialCards.h b/components/Cards/src/MaterialCards.h index 3a81d7ddec1..69bd1b0a306 100644 --- a/components/Cards/src/MaterialCards.h +++ b/components/Cards/src/MaterialCards.h @@ -14,4 +14,3 @@ #import "MDCCard.h" #import "MDCCardCollectionCell.h" - diff --git a/components/Chips/examples/supplemental/ChipsExamplesSupplemental.h b/components/Chips/examples/supplemental/ChipsExamplesSupplemental.h index 6d6eff17e71..ae0c1714c48 100644 --- a/components/Chips/examples/supplemental/ChipsExamplesSupplemental.h +++ b/components/Chips/examples/supplemental/ChipsExamplesSupplemental.h @@ -23,16 +23,16 @@ @interface ExampleChipCollectionViewController : UICollectionViewController @end -@interface ChipsChoiceExampleViewController : UIViewController - +@interface ChipsChoiceExampleViewController + : UIViewController @property(nonatomic, strong) NSArray *titles; @property(nonatomic, strong) UICollectionView *collectionView; @property(nonatomic, strong) MDCSemanticColorScheme *colorScheme; @property(nonatomic, strong) MDCShapeScheme *shapeScheme; @end -@interface ChipsActionExampleViewController : UIViewController - +@interface ChipsActionExampleViewController + : UIViewController @property(nonatomic, strong) NSArray *titles; @property(nonatomic, strong) UICollectionView *collectionView; @property(nonatomic, strong) MDCSemanticColorScheme *colorScheme; @@ -40,14 +40,13 @@ @property(nonatomic, strong) MDCTypographyScheme *typographyScheme; @end -@interface ChipsCollectionExampleViewController : ExampleChipCollectionViewController - +@interface ChipsCollectionExampleViewController + : ExampleChipCollectionViewController @property(nonatomic, strong) NSArray *titles; @end - -@interface ChipsCustomizedExampleViewController : UIViewController - +@interface ChipsCustomizedExampleViewController + : UIViewController @property(nonatomic, strong) NSArray *titles; @end @@ -55,16 +54,16 @@ - (UIImage *)doneImage; @end -@interface ChipsFilterExampleViewController : UIViewController - +@interface ChipsFilterExampleViewController + : UIViewController @property(nonatomic, strong) NSArray *titles; @property(nonatomic, strong) MDCSemanticColorScheme *colorScheme; @property(nonatomic, strong) MDCShapeScheme *shapeScheme; @property(nonatomic, strong) MDCTypographyScheme *typographyScheme; @end -@interface ChipsFilterAnimatedExampleViewController : ChipsFilterExampleViewController - +@interface ChipsFilterAnimatedExampleViewController + : ChipsFilterExampleViewController @end @interface ChipsFilterExampleViewController (Supplemental) @@ -85,8 +84,10 @@ - (UIButton *)deleteButton; @end -@interface ChipsTypicalUseViewController : ExampleChipCollectionViewController - +@interface ChipsTypicalUseViewController + : ExampleChipCollectionViewController @property(nonatomic, strong) NSArray *model; @property(nonatomic, strong) MDCShapeScheme *shapeScheme; @property(nonatomic, strong) MDCTypographyScheme *typographyScheme; diff --git a/components/Chips/src/ChipThemer/MDCChipViewThemer.h b/components/Chips/src/ChipThemer/MDCChipViewThemer.h index 11f0712e70d..3e5de5b4713 100644 --- a/components/Chips/src/ChipThemer/MDCChipViewThemer.h +++ b/components/Chips/src/ChipThemer/MDCChipViewThemer.h @@ -25,16 +25,15 @@ /** Applies a chip view scheme's properties to an MDCChipView. - + @param scheme The chip view scheme to apply to the component instance. @param chip A component instance to which the scheme should be applied. */ -+ (void)applyScheme:(nonnull id)scheme - toChipView:(nonnull MDCChipView *)chip; ++ (void)applyScheme:(nonnull id)scheme toChipView:(nonnull MDCChipView *)chip; /** Applies a chip view scheme's properties to an MDCChipView using the outlined style. - + @param scheme The chip view scheme to apply to the component instance. @param chip A component instance to which the scheme should be applied. */ diff --git a/components/Chips/src/ChipThemer/MaterialChips+ChipThemer.h b/components/Chips/src/ChipThemer/MaterialChips+ChipThemer.h index 0c23cfc8b18..702f2b12923 100644 --- a/components/Chips/src/ChipThemer/MaterialChips+ChipThemer.h +++ b/components/Chips/src/ChipThemer/MaterialChips+ChipThemer.h @@ -12,5 +12,5 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "MDCChipViewThemer.h" #import "MDCChipViewScheme.h" +#import "MDCChipViewThemer.h" diff --git a/components/Chips/src/ColorThemer/MDCChipViewColorThemer.h b/components/Chips/src/ColorThemer/MDCChipViewColorThemer.h index ef950a93dd5..e8e64e4af23 100644 --- a/components/Chips/src/ColorThemer/MDCChipViewColorThemer.h +++ b/components/Chips/src/ColorThemer/MDCChipViewColorThemer.h @@ -49,7 +49,7 @@ @warning This method will soon be deprecated. Consider using @c +applyOutlinedVariantWithColorScheme:toChipView: instead. - + @param colorScheme The color scheme to apply to the component instance. @param strokedChipView A component instance to which the color scheme should be applied. */ diff --git a/components/Chips/src/ColorThemer/MaterialChips+ColorThemer.h b/components/Chips/src/ColorThemer/MaterialChips+ColorThemer.h index 268f75687bb..d594e554b3f 100644 --- a/components/Chips/src/ColorThemer/MaterialChips+ColorThemer.h +++ b/components/Chips/src/ColorThemer/MaterialChips+ColorThemer.h @@ -13,4 +13,3 @@ // limitations under the License. #import "MDCChipViewColorThemer.h" - diff --git a/components/Chips/src/MDCChipField.h b/components/Chips/src/MDCChipField.h index 776337f4582..33253012ca6 100644 --- a/components/Chips/src/MDCChipField.h +++ b/components/Chips/src/MDCChipField.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import #import +#import #import "MDCChipView.h" #import "MaterialTextFields.h" diff --git a/components/Chips/src/MDCChipView.h b/components/Chips/src/MDCChipView.h index 376ec9fc8c6..76b58663fa5 100644 --- a/components/Chips/src/MDCChipView.h +++ b/components/Chips/src/MDCChipView.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import #import +#import #import "MaterialShadowElevations.h" #import "MaterialShapes.h" @@ -113,8 +113,8 @@ /* The color of the ink ripple. */ -@property(nonatomic, strong, null_resettable) UIColor *inkColor UI_APPEARANCE_SELECTOR - __deprecated_msg("Use setInkColor:forState:"); +@property(nonatomic, strong, null_resettable) + UIColor *inkColor UI_APPEARANCE_SELECTOR __deprecated_msg("Use setInkColor:forState:"); /* The shape generator used to define the chip's shape. @@ -168,8 +168,8 @@ @param backgroundColor The background color. @param state The control state. */ -- (void)setBackgroundColor:(nullable UIColor *)backgroundColor forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setBackgroundColor:(nullable UIColor *)backgroundColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /* Returns the border color for a particular control state. @@ -188,8 +188,8 @@ @param borderColor The border color. @param state The control state. */ -- (void)setBorderColor:(nullable UIColor *)borderColor forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setBorderColor:(nullable UIColor *)borderColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /* Returns the border width for a particular control state. @@ -227,8 +227,8 @@ @param elevation The elevation. @param state The control state. */ -- (void)setElevation:(MDCShadowElevation)elevation forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setElevation:(MDCShadowElevation)elevation + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /* Returns the ink color for a particular control state. @@ -247,8 +247,8 @@ @param inkColor The ink color. @param state The control state. */ -- (void)setInkColor:(nullable UIColor *)inkColor forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setInkColor:(nullable UIColor *)inkColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /* Returns the shadow color for a particular control state. @@ -267,8 +267,8 @@ @param elevation The shadow color. @param state The control state. */ -- (void)setShadowColor:(nullable UIColor *)shadowColor forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setShadowColor:(nullable UIColor *)shadowColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /* Returns the title color for a particular control state. @@ -287,7 +287,7 @@ @param titleColor The title color. @param state The control state. */ -- (void)setTitleColor:(nullable UIColor *)titleColor forState:(UIControlState)state - UI_APPEARANCE_SELECTOR; +- (void)setTitleColor:(nullable UIColor *)titleColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; @end diff --git a/components/Chips/src/MaterialChips.h b/components/Chips/src/MaterialChips.h index cb0bd60c474..5452c64a6fc 100644 --- a/components/Chips/src/MaterialChips.h +++ b/components/Chips/src/MaterialChips.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "MDCChipCollectionViewFlowLayout.h" #import "MDCChipCollectionViewCell.h" +#import "MDCChipCollectionViewFlowLayout.h" #import "MDCChipField.h" #import "MDCChipView.h" diff --git a/components/Collections/examples/supplemental/CollectionsEditingManyCellsExampleSupplemental.h b/components/Collections/examples/supplemental/CollectionsEditingManyCellsExampleSupplemental.h index c5b86203e71..efafb0f5c46 100644 --- a/components/Collections/examples/supplemental/CollectionsEditingManyCellsExampleSupplemental.h +++ b/components/Collections/examples/supplemental/CollectionsEditingManyCellsExampleSupplemental.h @@ -20,5 +20,5 @@ static NSString *const kCollectionsEditingManyCellsCellIdentifierItem = @"itemCe static NSString *const kCollectionsEditingManyCellsHeaderReuseIdentifier = @"EditingExampleHeader"; @interface CollectionsEditingManyCellsExample : MDCCollectionViewController -@property (nonatomic, strong) NSMutableArray *content; +@property(nonatomic, strong) NSMutableArray *content; @end diff --git a/components/Collections/examples/supplemental/CollectionsSectionInsetsExampleSupplemental.h b/components/Collections/examples/supplemental/CollectionsSectionInsetsExampleSupplemental.h index f3db507f0d6..d6950c782e9 100644 --- a/components/Collections/examples/supplemental/CollectionsSectionInsetsExampleSupplemental.h +++ b/components/Collections/examples/supplemental/CollectionsSectionInsetsExampleSupplemental.h @@ -21,6 +21,6 @@ static const NSInteger kSectionItemCount = 3; static NSString *const kReusableIdentifierItem = @"itemCellIdentifier"; @interface CollectionsSectionInsetsExample : MDCCollectionViewController -@property(nonatomic, readonly, copy) NSMutableArray *content; +@property(nonatomic, readonly, copy) NSMutableArray *content; @property(nonatomic, readonly, copy) NSMutableDictionary *sectionUsesCustomInsets; @end diff --git a/components/Collections/src/MDCCollectionViewController.h b/components/Collections/src/MDCCollectionViewController.h index f6919c47054..167e1239fcc 100644 --- a/components/Collections/src/MDCCollectionViewController.h +++ b/components/Collections/src/MDCCollectionViewController.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import #import +#import #import "MDCCollectionViewEditingDelegate.h" #import "MDCCollectionViewStylingDelegate.h" diff --git a/components/Collections/src/MDCCollectionViewStyling.h b/components/Collections/src/MDCCollectionViewStyling.h index 9e39c9eb921..79fa0de0df7 100644 --- a/components/Collections/src/MDCCollectionViewStyling.h +++ b/components/Collections/src/MDCCollectionViewStyling.h @@ -115,7 +115,7 @@ typedef NS_ENUM(NSUInteger, MDCCollectionViewCellLayoutType) { @return Edge outsets as detemined by cell style at this index. */ - (UIEdgeInsets)backgroundImageViewOutsetsForCellWithAttribute: - (nonnull MDCCollectionViewLayoutAttributes *)attr; + (nonnull MDCCollectionViewLayoutAttributes *)attr; /** Returns an image for use with the given cell style and ordinal position within section. @@ -127,7 +127,7 @@ typedef NS_ENUM(NSUInteger, MDCCollectionViewCellLayoutType) { @return Image as determined by cell style and section ordinal position. */ - (nullable UIImage *)backgroundImageForCellLayoutAttributes: - (nonnull MDCCollectionViewLayoutAttributes *)attr; + (nonnull MDCCollectionViewLayoutAttributes *)attr; #pragma mark - Cell Separator @@ -153,7 +153,7 @@ typedef NS_ENUM(NSUInteger, MDCCollectionViewCellLayoutType) { @return Whether the separtor should be hidden. */ - (BOOL)shouldHideSeparatorForCellLayoutAttributes: - (nonnull MDCCollectionViewLayoutAttributes *)attr; + (nonnull MDCCollectionViewLayoutAttributes *)attr; #pragma mark - Item Inlaying diff --git a/components/Dialogs/src/DialogThemer/MDCAlertControllerThemer.h b/components/Dialogs/src/DialogThemer/MDCAlertControllerThemer.h index 1302207839b..967745ceb3b 100644 --- a/components/Dialogs/src/DialogThemer/MDCAlertControllerThemer.h +++ b/components/Dialogs/src/DialogThemer/MDCAlertControllerThemer.h @@ -14,8 +14,8 @@ #import -#import "MaterialDialogs.h" #import "MDCAlertScheme.h" +#import "MaterialDialogs.h" @interface MDCAlertControllerThemer : NSObject diff --git a/components/Dialogs/src/MDCDialogPresentationController.h b/components/Dialogs/src/MDCDialogPresentationController.h index a57e9ef7278..b9a328c8e3b 100644 --- a/components/Dialogs/src/MDCDialogPresentationController.h +++ b/components/Dialogs/src/MDCDialogPresentationController.h @@ -46,7 +46,7 @@ Customize the corner radius of the shadow to match the presented view's corner radius. If the presented view corner radius and dialogCornerRadius are different, the rendered shadow will not match. - + Defaults to 0.0. */ @property(nonatomic, assign) CGFloat dialogCornerRadius; diff --git a/components/Dialogs/src/UIViewController+MaterialDialogs.h b/components/Dialogs/src/UIViewController+MaterialDialogs.h index 4850d04c53d..cea65021179 100644 --- a/components/Dialogs/src/UIViewController+MaterialDialogs.h +++ b/components/Dialogs/src/UIViewController+MaterialDialogs.h @@ -26,6 +26,7 @@ @return nil if the view controller is not managed by a Material dialog presentaiton controller. */ -@property(nonatomic, nullable, readonly) MDCDialogPresentationController *mdc_dialogPresentationController; +@property(nonatomic, nullable, readonly) + MDCDialogPresentationController *mdc_dialogPresentationController; @end diff --git a/components/Dialogs/src/private/MaterialDialogsStrings.h b/components/Dialogs/src/private/MaterialDialogsStrings.h index 7d728b783be..3ee6a9339cd 100644 --- a/components/Dialogs/src/private/MaterialDialogsStrings.h +++ b/components/Dialogs/src/private/MaterialDialogsStrings.h @@ -13,7 +13,8 @@ // limitations under the License. // GENERATED CODE: DO NOT EDIT BY HAND -// GENERATED FROM: components/Dialogs/src/MaterialDialogs.bundle/Resources/en.lproj/MaterialDialogs.strings +// GENERATED FROM: +// components/Dialogs/src/MaterialDialogs.bundle/Resources/en.lproj/MaterialDialogs.strings // GENERATED BY: generate_string_tables.py typedef enum { diff --git a/components/Dialogs/src/private/MaterialDialogsStrings_table.h b/components/Dialogs/src/private/MaterialDialogsStrings_table.h index 799e73d8620..0a588a2c4b3 100644 --- a/components/Dialogs/src/private/MaterialDialogsStrings_table.h +++ b/components/Dialogs/src/private/MaterialDialogsStrings_table.h @@ -13,7 +13,8 @@ // limitations under the License. // GENERATED CODE: DO NOT EDIT BY HAND -// GENERATED FROM: components/Dialogs/src/MaterialDialogs.bundle/Resources/en.lproj/MaterialDialogs.strings +// GENERATED FROM: +// components/Dialogs/src/MaterialDialogs.bundle/Resources/en.lproj/MaterialDialogs.strings // GENERATED BY: generate_string_tables.py #import @@ -22,7 +23,7 @@ // This table is to be indexed using the generated enum. static NSString *const kMaterialDialogsStringTable[] = { - @"MaterialDialogsPresentedAccessibilityAnnouncement", // Alert + @"MaterialDialogsPresentedAccessibilityAnnouncement", // Alert }; #define kNumMaterialDialogsStrings 1 #define kMaterialDialogsStringsOffset 0 diff --git a/components/FeatureHighlight/src/ColorThemer/MDCFeatureHighlightColorThemer.h b/components/FeatureHighlight/src/ColorThemer/MDCFeatureHighlightColorThemer.h index 8a18b90f85b..f5ede7dd732 100644 --- a/components/FeatureHighlight/src/ColorThemer/MDCFeatureHighlightColorThemer.h +++ b/components/FeatureHighlight/src/ColorThemer/MDCFeatureHighlightColorThemer.h @@ -44,7 +44,7 @@ @c applySemanticColorScheme:toFeatureHighlightViewController: instead. Learn more at components/schemes/Color/docs/migration-guide-semantic-color-scheme.md - @param colorScheme The color scheme to apply to MDCFeatureHighlightView. + @param colorScheme The color scheme to apply to MDCFeatureHighlightView. @param featureHighlightView A MDCFeatureHighlightView instance to apply a color scheme. */ + (void)applyColorScheme:(nonnull id)colorScheme diff --git a/components/FeatureHighlight/src/FeatureHighlightAccessibilityMutator/MDCFeatureHighlightAccessibilityMutator.h b/components/FeatureHighlight/src/FeatureHighlightAccessibilityMutator/MDCFeatureHighlightAccessibilityMutator.h index e55d00fac38..e7281874b0f 100644 --- a/components/FeatureHighlight/src/FeatureHighlightAccessibilityMutator/MDCFeatureHighlightAccessibilityMutator.h +++ b/components/FeatureHighlight/src/FeatureHighlightAccessibilityMutator/MDCFeatureHighlightAccessibilityMutator.h @@ -31,4 +31,3 @@ + (void)mutate:(MDCFeatureHighlightViewController *)featureHighlightViewController; @end - diff --git a/components/FeatureHighlight/src/FontThemer/MDCFeatureHighlightFontThemer.h b/components/FeatureHighlight/src/FontThemer/MDCFeatureHighlightFontThemer.h index ebb4f00b43f..77b842c7de7 100644 --- a/components/FeatureHighlight/src/FontThemer/MDCFeatureHighlightFontThemer.h +++ b/components/FeatureHighlight/src/FontThemer/MDCFeatureHighlightFontThemer.h @@ -32,7 +32,7 @@ @warning This API will soon be deprecated. Please consider using MDCFeatureHighlightTypographyThemer instead. - + @param fontScheme The font scheme to apply to MDCFeatureHighlightView. @param featureHighlightView A MDCFeatureHighlightView instance to apply a font scheme. */ diff --git a/components/FeatureHighlight/src/MaterialFeatureHighlight.h b/components/FeatureHighlight/src/MaterialFeatureHighlight.h index b41d6eb7546..f6c87c2bb1a 100644 --- a/components/FeatureHighlight/src/MaterialFeatureHighlight.h +++ b/components/FeatureHighlight/src/MaterialFeatureHighlight.h @@ -12,5 +12,5 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "MDCFeatureHighlightViewController.h" #import "MDCFeatureHighlightView.h" +#import "MDCFeatureHighlightViewController.h" diff --git a/components/FeatureHighlight/src/private/MDCFeatureHighlightLayer.h b/components/FeatureHighlight/src/private/MDCFeatureHighlightLayer.h index b7fbac77d56..c5fc15d8a5f 100644 --- a/components/FeatureHighlight/src/private/MDCFeatureHighlightLayer.h +++ b/components/FeatureHighlight/src/private/MDCFeatureHighlightLayer.h @@ -22,8 +22,7 @@ - (void)setFillColor:(CGColorRef)fillColor animated:(BOOL)animated; -- (void)animateRadiusOverKeyframes:(NSArray *)radii - keyTimes:(NSArray *)keyTimes; +- (void)animateRadiusOverKeyframes:(NSArray *)radii keyTimes:(NSArray *)keyTimes; - (void)animateFillColorOverKeyframes:(NSArray *)colors keyTimes:(NSArray *)keyTimes; diff --git a/components/FlexibleHeader/src/ColorThemer/MDCFlexibleHeaderColorThemer.h b/components/FlexibleHeader/src/ColorThemer/MDCFlexibleHeaderColorThemer.h index bee0616a6a6..a11d0e1b517 100644 --- a/components/FlexibleHeader/src/ColorThemer/MDCFlexibleHeaderColorThemer.h +++ b/components/FlexibleHeader/src/ColorThemer/MDCFlexibleHeaderColorThemer.h @@ -72,6 +72,7 @@ @param flexibleHeaderController A MDCFlexibleHeaderViewController instance to apply a color scheme. */ + (void)applyColorScheme:(nonnull id)colorScheme - toMDCFlexibleHeaderController:(nonnull MDCFlexibleHeaderViewController *)flexibleHeaderController; + toMDCFlexibleHeaderController: + (nonnull MDCFlexibleHeaderViewController *)flexibleHeaderController; @end diff --git a/components/FlexibleHeader/src/MDCFlexibleHeaderContainerViewController.h b/components/FlexibleHeader/src/MDCFlexibleHeaderContainerViewController.h index 1a77e330135..53b11571f8b 100644 --- a/components/FlexibleHeader/src/MDCFlexibleHeaderContainerViewController.h +++ b/components/FlexibleHeader/src/MDCFlexibleHeaderContainerViewController.h @@ -26,7 +26,7 @@ @interface MDCFlexibleHeaderContainerViewController : UIViewController - (nonnull instancetype)initWithContentViewController: - (nullable UIViewController *)contentViewController NS_DESIGNATED_INITIALIZER; + (nullable UIViewController *)contentViewController NS_DESIGNATED_INITIALIZER; /** The header view controller that lives alongside the content view controller. diff --git a/components/FlexibleHeader/src/MDCFlexibleHeaderView.h b/components/FlexibleHeader/src/MDCFlexibleHeaderView.h index f2218218627..43950646393 100644 --- a/components/FlexibleHeader/src/MDCFlexibleHeaderView.h +++ b/components/FlexibleHeader/src/MDCFlexibleHeaderView.h @@ -379,7 +379,7 @@ IB_DESIGNABLE Informs the receiver that the flexible header view's preferred status bar visibility has changed. */ - (void)flexibleHeaderViewNeedsStatusBarAppearanceUpdate: - (nonnull MDCFlexibleHeaderView *)headerView; + (nonnull MDCFlexibleHeaderView *)headerView; /** Informs the receiver that the flexible header view's frame has changed. diff --git a/components/FlexibleHeader/src/MaterialFlexibleHeader.h b/components/FlexibleHeader/src/MaterialFlexibleHeader.h index 74b4cee2e35..0daae02b98d 100644 --- a/components/FlexibleHeader/src/MaterialFlexibleHeader.h +++ b/components/FlexibleHeader/src/MaterialFlexibleHeader.h @@ -13,6 +13,6 @@ // limitations under the License. #import "MDCFlexibleHeaderContainerViewController.h" -#import "MDCFlexibleHeaderView.h" #import "MDCFlexibleHeaderView+ShiftBehavior.h" +#import "MDCFlexibleHeaderView.h" #import "MDCFlexibleHeaderViewController.h" diff --git a/components/Ink/src/ColorThemer/MDCInkColorThemer.h b/components/Ink/src/ColorThemer/MDCInkColorThemer.h index c5b48ed0c9d..6bc33789c27 100644 --- a/components/Ink/src/ColorThemer/MDCInkColorThemer.h +++ b/components/Ink/src/ColorThemer/MDCInkColorThemer.h @@ -43,4 +43,3 @@ toInkView:(nonnull MDCInkView *)inkView; @end - diff --git a/components/Ink/src/private/MDCInkLayer.h b/components/Ink/src/private/MDCInkLayer.h index 207d72c4522..85e88d23877 100644 --- a/components/Ink/src/private/MDCInkLayer.h +++ b/components/Ink/src/private/MDCInkLayer.h @@ -74,7 +74,6 @@ */ - (void)startAnimationAtPoint:(CGPoint)point; - /** Starts the ink ripple @@ -94,7 +93,6 @@ */ - (void)endAnimationAtPoint:(CGPoint)point; - /** Ends the ink ripple diff --git a/components/Ink/src/private/MDCLegacyInkLayer+Testing.h b/components/Ink/src/private/MDCLegacyInkLayer+Testing.h index 48782a2b100..5be5d834b9b 100644 --- a/components/Ink/src/private/MDCLegacyInkLayer+Testing.h +++ b/components/Ink/src/private/MDCLegacyInkLayer+Testing.h @@ -24,7 +24,7 @@ @end -@interface MDCLegacyInkLayer () +@interface MDCLegacyInkLayer () @end @interface MDCLegacyInkLayerRipple : CAShapeLayer diff --git a/components/LibraryInfo/src/MDCLibraryInfo.h b/components/LibraryInfo/src/MDCLibraryInfo.h index 145e00a99ad..d455f121651 100644 --- a/components/LibraryInfo/src/MDCLibraryInfo.h +++ b/components/LibraryInfo/src/MDCLibraryInfo.h @@ -17,12 +17,11 @@ /** Information about the Material Components library. */ -__attribute__((objc_subclassing_restricted)) -@interface MDCLibraryInfo: NSObject +__attribute__((objc_subclassing_restricted)) @interface MDCLibraryInfo : NSObject /** The version of the MDC-iOS library. - + The version string will always have the form "X.Y.Z", where - X is the major version number of the library. - Y is the minor version number of the library. diff --git a/components/List/examples/MDCBaseCellExample.h b/components/List/examples/MDCBaseCellExample.h index c12ed55a0c9..075a515ddfb 100644 --- a/components/List/examples/MDCBaseCellExample.h +++ b/components/List/examples/MDCBaseCellExample.h @@ -20,11 +20,10 @@ static NSString *const kBaseCellIdentifier = @"kBaseCellIdentifier"; @interface MDCBaseCellExample : UIViewController @end -@interface MDCBaseCellExample () +@interface MDCBaseCellExample () -@property (strong, nonatomic) UICollectionView *collectionView; -@property (strong, nonatomic) UICollectionViewFlowLayout *collectionViewLayout; -@property (nonatomic, assign) NSInteger numberOfCells; +@property(strong, nonatomic) UICollectionView *collectionView; +@property(strong, nonatomic) UICollectionViewFlowLayout *collectionViewLayout; +@property(nonatomic, assign) NSInteger numberOfCells; @end diff --git a/components/List/examples/supplemental/CollectionViewListCell.h b/components/List/examples/supplemental/CollectionViewListCell.h index cb7610e0b3e..ada08e2d7c9 100644 --- a/components/List/examples/supplemental/CollectionViewListCell.h +++ b/components/List/examples/supplemental/CollectionViewListCell.h @@ -52,7 +52,7 @@ Default value is NO. */ @property(nonatomic, readwrite, setter=mdc_setAdjustsFontForContentSizeCategory:) -BOOL mdc_adjustsFontForContentSizeCategory; + BOOL mdc_adjustsFontForContentSizeCategory; /** Sets the cell width for the self-sizing cell. diff --git a/components/List/src/MDCBaseCell.h b/components/List/src/MDCBaseCell.h index 7425f17b8a9..ffd391f403f 100644 --- a/components/List/src/MDCBaseCell.h +++ b/components/List/src/MDCBaseCell.h @@ -21,11 +21,11 @@ /** The current elevation of the cell. */ -@property (nonatomic, assign) MDCShadowElevation elevation; +@property(nonatomic, assign) MDCShadowElevation elevation; /** The color of the cell’s underlying Ripple. */ -@property (nonatomic, strong, nonnull) UIColor *inkColor; +@property(nonatomic, strong, nonnull) UIColor *inkColor; @end diff --git a/components/MaskedTransition/src/MDCMaskedTransitionController.h b/components/MaskedTransition/src/MDCMaskedTransitionController.h index 63575512dfc..499a3b7f070 100644 --- a/components/MaskedTransition/src/MDCMaskedTransitionController.h +++ b/components/MaskedTransition/src/MDCMaskedTransitionController.h @@ -21,10 +21,10 @@ The presenting view controller will typically store a reference to an instance of this class and assign it to the transitioningDelegate of a view controller prior to presenting it. - + With zero additional configuration, the transition will perform a fullscreen masked reveal presentation, with a slide down dismissal. - + It's possible to configure the presented view controller's frame by setting the calculateFrameOfPresentedView property. The provided block should return the desired frame of the presented view controller. When using calculateFrameOfPresentedView you must also change the @@ -42,7 +42,7 @@ /** Initializes the transition controller without a source view. - + Note that if no source view is available at the time of presentation, the transition will fall back to the default system presentation. */ @@ -62,7 +62,7 @@ You must set the view controller-to-be-presented's modalPresentationStyle property to `UIModalPresentationCustom` in order to use this property. */ -@property(nonatomic, copy, nullable) - CGRect (^calculateFrameOfPresentedView)(UIPresentationController * _Nonnull); +@property(nonatomic, copy, nullable) CGRect (^calculateFrameOfPresentedView) + (UIPresentationController *_Nonnull); @end diff --git a/components/MaskedTransition/src/private/MDCMaskedPresentationController.h b/components/MaskedTransition/src/private/MDCMaskedPresentationController.h index ea3ab5f1924..39de935fc23 100644 --- a/components/MaskedTransition/src/private/MDCMaskedPresentationController.h +++ b/components/MaskedTransition/src/private/MDCMaskedPresentationController.h @@ -20,9 +20,9 @@ - (instancetype)initWithPresentedViewController:(UIViewController *)presentedViewController presentingViewController:(UIViewController *)presentingViewController - calculateFrameOfPresentedView:(CGRect (^)(UIPresentationController *))calculateFrameOfPresentedView - sourceView:(UIView *)sourceView - NS_DESIGNATED_INITIALIZER; + calculateFrameOfPresentedView: + (CGRect (^)(UIPresentationController *))calculateFrameOfPresentedView + sourceView:(UIView *)sourceView NS_DESIGNATED_INITIALIZER; - (instancetype)initWithPresentedViewController:(UIViewController *)presentedViewController presentingViewController:(UIViewController *)presentingViewController diff --git a/components/MaskedTransition/src/private/MDCMaskedTransition.h b/components/MaskedTransition/src/private/MDCMaskedTransition.h index 265f9fbb363..6fb80cc0a04 100644 --- a/components/MaskedTransition/src/private/MDCMaskedTransition.h +++ b/components/MaskedTransition/src/private/MDCMaskedTransition.h @@ -22,7 +22,7 @@ It is presently assumed that the mask will be a circular mask and that the source view is a view with equal width and height and a corner radius equal to half the view's width. */ -@interface MDCMaskedTransition: NSObject +@interface MDCMaskedTransition : NSObject /** Initializes the transition with the view from which the mask should emanate. @@ -40,7 +40,8 @@ If provided, the block will be invoked immediately before the transition is initiated and the returned rect will be assigned to the presented view controller's frame. */ -@property(nonatomic, copy, nullable) CGRect (^calculateFrameOfPresentedView)(UIPresentationController * _Nonnull); +@property(nonatomic, copy, nullable) CGRect (^calculateFrameOfPresentedView) + (UIPresentationController *_Nonnull); - (nonnull instancetype)init NS_UNAVAILABLE; diff --git a/components/MaskedTransition/src/private/MDCMaskedTransitionMotionForContext.h b/components/MaskedTransition/src/private/MDCMaskedTransitionMotionForContext.h index 4bf0e15b9c6..2781b51c945 100644 --- a/components/MaskedTransition/src/private/MDCMaskedTransitionMotionForContext.h +++ b/components/MaskedTransition/src/private/MDCMaskedTransitionMotionForContext.h @@ -18,6 +18,5 @@ #import "MDCMaskedTransitionMotionSpecs.h" FOUNDATION_EXPORT -MDCMaskedTransitionMotionSpec - MDCMaskedTransitionMotionSpecForContext(UIView *containerView, - UIViewController *presentedViewController); +MDCMaskedTransitionMotionSpec MDCMaskedTransitionMotionSpecForContext( + UIView *containerView, UIViewController *presentedViewController); diff --git a/components/MaskedTransition/src/private/MDCMaskedTransitionMotionSpecs.h b/components/MaskedTransition/src/private/MDCMaskedTransitionMotionSpecs.h index ded9b4ee21f..7dbc241f08a 100644 --- a/components/MaskedTransition/src/private/MDCMaskedTransitionMotionSpecs.h +++ b/components/MaskedTransition/src/private/MDCMaskedTransitionMotionSpecs.h @@ -33,7 +33,7 @@ typedef struct MDCMaskedTransitionMotionSpec { BOOL isCentered; } MDCMaskedTransitionMotionSpec; -@interface MDCMaskedTransitionMotionSpecs: NSObject +@interface MDCMaskedTransitionMotionSpecs : NSObject @property(nonatomic, class, readonly) MDCMaskedTransitionMotionSpec fullscreen; @property(nonatomic, class, readonly) MDCMaskedTransitionMotionSpec bottomSheet; diff --git a/components/NavigationBar/examples/supplemental/NavigationBarTypicalUseExampleSupplemental.h b/components/NavigationBar/examples/supplemental/NavigationBarTypicalUseExampleSupplemental.h index 3ca081797af..ef66e11c854 100644 --- a/components/NavigationBar/examples/supplemental/NavigationBarTypicalUseExampleSupplemental.h +++ b/components/NavigationBar/examples/supplemental/NavigationBarTypicalUseExampleSupplemental.h @@ -49,5 +49,3 @@ @property(nonatomic, strong, nullable) MDCSemanticColorScheme *colorScheme; @property(nonatomic, strong, nullable) MDCTypographyScheme *typographyScheme; @end - - diff --git a/components/NavigationDrawer/src/MaterialNavigationDrawer.h b/components/NavigationDrawer/src/MaterialNavigationDrawer.h index db229427068..c20173ed4ec 100644 --- a/components/NavigationDrawer/src/MaterialNavigationDrawer.h +++ b/components/NavigationDrawer/src/MaterialNavigationDrawer.h @@ -13,6 +13,6 @@ // limitations under the License. #import "MDCBottomDrawerHeader.h" -#import "MDCBottomDrawerViewController.h" -#import "MDCBottomDrawerTransitionController.h" #import "MDCBottomDrawerPresentationController.h" +#import "MDCBottomDrawerTransitionController.h" +#import "MDCBottomDrawerViewController.h" diff --git a/components/PageControl/src/ColorThemer/MDCPageControlColorThemer.h b/components/PageControl/src/ColorThemer/MDCPageControlColorThemer.h index 0d5b866f00b..698a6c5b813 100644 --- a/components/PageControl/src/ColorThemer/MDCPageControlColorThemer.h +++ b/components/PageControl/src/ColorThemer/MDCPageControlColorThemer.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "MaterialThemes.h" #import "MaterialPageControl.h" +#import "MaterialThemes.h" #import diff --git a/components/ProgressView/src/ColorThemer/MDCProgressViewColorThemer.h b/components/ProgressView/src/ColorThemer/MDCProgressViewColorThemer.h index 648033088df..f36579c3a69 100644 --- a/components/ProgressView/src/ColorThemer/MDCProgressViewColorThemer.h +++ b/components/ProgressView/src/ColorThemer/MDCProgressViewColorThemer.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "MaterialThemes.h" #import "MaterialProgressView.h" +#import "MaterialThemes.h" #import diff --git a/components/ProgressView/src/private/MDCProgressViewMotionSpec.h b/components/ProgressView/src/private/MDCProgressViewMotionSpec.h index 96bf3d18c13..6d559540b79 100644 --- a/components/ProgressView/src/private/MDCProgressViewMotionSpec.h +++ b/components/ProgressView/src/private/MDCProgressViewMotionSpec.h @@ -15,7 +15,7 @@ #import #import -@interface MDCProgressViewMotionSpec: NSObject +@interface MDCProgressViewMotionSpec : NSObject @property(nonatomic, class, readonly) MDMMotionTiming willChangeProgress; @property(nonatomic, class, readonly) MDMMotionTiming willChangeHidden; diff --git a/components/ShadowElevations/src/MDCShadowElevations.h b/components/ShadowElevations/src/MDCShadowElevations.h index 10180486038..f3ac721399c 100644 --- a/components/ShadowElevations/src/MDCShadowElevations.h +++ b/components/ShadowElevations/src/MDCShadowElevations.h @@ -15,9 +15,9 @@ #import #import -#ifdef NS_TYPED_EXTENSIBLE_ENUM // This macro is introduced in Xcode 9. +#ifdef NS_TYPED_EXTENSIBLE_ENUM // This macro is introduced in Xcode 9. #define MDC_SHADOW_ELEVATION_TYPED_EXTENSIBLE_ENUM NS_TYPED_EXTENSIBLE_ENUM -#elif __has_attribute(swift_wrapper) // Backwards compatibility for Xcode 8. +#elif __has_attribute(swift_wrapper) // Backwards compatibility for Xcode 8. #define MDC_SHADOW_ELEVATION_TYPED_EXTENSIBLE_ENUM __attribute__((swift_wrapper(struct))) #else #define MDC_SHADOW_ELEVATION_TYPED_EXTENSIBLE_ENUM diff --git a/components/Slider/src/ColorThemer/MDCSliderColorThemer.h b/components/Slider/src/ColorThemer/MDCSliderColorThemer.h index 7f3dd2895eb..11a4c319552 100644 --- a/components/Slider/src/ColorThemer/MDCSliderColorThemer.h +++ b/components/Slider/src/ColorThemer/MDCSliderColorThemer.h @@ -65,5 +65,4 @@ */ + (nonnull MDCBasicColorScheme *)defaultSliderDarkColorScheme; - @end diff --git a/components/Slider/src/MDCSlider.h b/components/Slider/src/MDCSlider.h index b58326087eb..7b034da3387 100644 --- a/components/Slider/src/MDCSlider.h +++ b/components/Slider/src/MDCSlider.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import #import +#import #import "MaterialShadowElevations.h" diff --git a/components/Snackbar/src/ColorThemer/MDCSnackbarColorThemer.h b/components/Snackbar/src/ColorThemer/MDCSnackbarColorThemer.h index 34924c1c50c..5049a8c71d2 100644 --- a/components/Snackbar/src/ColorThemer/MDCSnackbarColorThemer.h +++ b/components/Snackbar/src/ColorThemer/MDCSnackbarColorThemer.h @@ -52,7 +52,7 @@ @param snackbarMessageView A MDCSnackbarMessageView instance to apply a color scheme. */ + (void)applyColorScheme:(nonnull id)colorScheme - toSnackbarMessageView:(nonnull MDCSnackbarMessageView *)snackbarMessageView - __deprecated_msg("use applySemanticColorScheme: instead."); + toSnackbarMessageView:(nonnull MDCSnackbarMessageView *)snackbarMessageView + __deprecated_msg("use applySemanticColorScheme: instead."); @end diff --git a/components/Snackbar/src/FontThemer/MDCSnackbarFontThemer.h b/components/Snackbar/src/FontThemer/MDCSnackbarFontThemer.h index cceae790c78..99e308cd9c1 100644 --- a/components/Snackbar/src/FontThemer/MDCSnackbarFontThemer.h +++ b/components/Snackbar/src/FontThemer/MDCSnackbarFontThemer.h @@ -21,7 +21,7 @@ /** Used to apply a font scheme to theme to MDCSnackbarMessageView. - + @warning This class will soon be deprecated. Please consider using MDCSnackbarTypographyThemer instead. */ diff --git a/components/Snackbar/src/MDCSnackbarManager.h b/components/Snackbar/src/MDCSnackbarManager.h index ab7baf594e8..9ccfcca41d3 100644 --- a/components/Snackbar/src/MDCSnackbarManager.h +++ b/components/Snackbar/src/MDCSnackbarManager.h @@ -19,13 +19,11 @@ @class MDCSnackbarMessageView; @protocol MDCSnackbarSuspensionToken; - /** Delegate protocol for the MDCSnackbarManager. */ @protocol MDCSnackbarManagerDelegate - /** This method is called after the MDCSnackbarMessageView instance is initialized and right before The view is presented on the screen. @@ -59,8 +57,8 @@ If called within an animation block, the change will be animated. - @note This setting is only used when both the horizontal and vertical size classes of the presenting - window are @c UIUserInterfaceSizeClassRegular. Otherwise @c MDCSnackbarAlignmentCenter + @note This setting is only used when both the horizontal and vertical size classes of the + presenting window are @c UIUserInterfaceSizeClassRegular. Otherwise @c MDCSnackbarAlignmentCenter will be used. @note The setter must be called from the main thread. @@ -130,7 +128,7 @@ @return A token suitable for use in {@c +[MDCSnackbarManager resumeWithToken:]}. Letting this object deallocate is equivalent to calling {@c +[MDCSnackbarManager resumeMessagesWithToken:]}. */ -- (nullable id )suspendAllMessages; +- (nullable id)suspendAllMessages; /** Suspends the display of all messages in a given category. @@ -143,8 +141,8 @@ Letting this object dealloc is equivalent to calling {@c +[MDCSnackbarManager resumeMessagesWithToken:]}. */ -- (nullable id ) - suspendMessagesWithCategory:(nullable NSString *)category; +- (nullable id)suspendMessagesWithCategory: + (nullable NSString *)category; /** Resumes the display of messages once there are no outstanding suspension tokens. @@ -153,7 +151,7 @@ @param token The suspension token to invalidate. */ -- (void)resumeMessagesWithToken:(nullable id )token; +- (void)resumeMessagesWithToken:(nullable id)token; #pragma mark Styling @@ -282,18 +280,18 @@ /** Calls @c -suspendAllMessages on the @c defaultManager instance. */ -+ (nullable id )suspendAllMessages; ++ (nullable id)suspendAllMessages; /** Calls @c -suspendMessagesWithCategory: on the @c defaultManager instance. */ -+ (nullable id ) - suspendMessagesWithCategory:(nullable NSString *)category; ++ (nullable id)suspendMessagesWithCategory: + (nullable NSString *)category; /** Calls @c -resumeMessagesWithToken: on the @c defaultManager instance. */ -+ (void)resumeMessagesWithToken:(nullable id )token; ++ (void)resumeMessagesWithToken:(nullable id)token; /** Bound to @c snackbarMessageViewBackgroundColor on the @c defaultManager instance. diff --git a/components/Snackbar/src/MDCSnackbarMessage.h b/components/Snackbar/src/MDCSnackbarMessage.h index 7b7abf3b2e2..4c0516f0f3e 100644 --- a/components/Snackbar/src/MDCSnackbarMessage.h +++ b/components/Snackbar/src/MDCSnackbarMessage.h @@ -40,7 +40,7 @@ extern const NSTimeInterval MDCSnackbarMessageDurationMax; This attribute can be set over any range of @c attributedText and that text will have the proper font applied. */ -extern NSString * __nonnull const MDCSnackbarMessageBoldAttributeName; +extern NSString *__nonnull const MDCSnackbarMessageBoldAttributeName; /** Represents a message to unobtrusively show to the user. @@ -103,8 +103,8 @@ extern NSString * __nonnull const MDCSnackbarMessageBoldAttributeName; Default is nil, but MDCRGBAColor(0xFF, 0xFF, 0xFF, (CGFloat)0.6) will be set as the default color and is taken from MDCSnackbarMessageView's buttonTitleColorForState: */ -@property(nonatomic, strong, nullable) UIColor *buttonTextColor - __deprecated_msg("Use MDCSnackbarMessageView's buttonTitleColorForState: instead."); +@property(nonatomic, strong, nullable) UIColor *buttonTextColor __deprecated_msg( + "Use MDCSnackbarMessageView's buttonTitleColorForState: instead."); /** How long the message should be displayed. diff --git a/components/Snackbar/src/MDCSnackbarMessageView.h b/components/Snackbar/src/MDCSnackbarMessageView.h index f5c3f121ef6..eada953bcbb 100644 --- a/components/Snackbar/src/MDCSnackbarMessageView.h +++ b/components/Snackbar/src/MDCSnackbarMessageView.h @@ -85,9 +85,8 @@ @param titleColor The title color. @param state The control state. */ -- (void)setButtonTitleColor:(nullable UIColor *)titleColor forState:(UIControlState)state -UI_APPEARANCE_SELECTOR; - +- (void)setButtonTitleColor:(nullable UIColor *)titleColor + forState:(UIControlState)state UI_APPEARANCE_SELECTOR; /** Indicates whether the Snackbar should automatically update its font when the device’s @@ -102,7 +101,7 @@ UI_APPEARANCE_SELECTOR; Default value is NO. */ @property(nonatomic, readwrite, setter=mdc_setAdjustsFontForContentSizeCategory:) -BOOL mdc_adjustsFontForContentSizeCategory UI_APPEARANCE_SELECTOR; + BOOL mdc_adjustsFontForContentSizeCategory UI_APPEARANCE_SELECTOR; @end diff --git a/components/Snackbar/src/private/MDCSnackbarMessageViewInternal.h b/components/Snackbar/src/private/MDCSnackbarMessageViewInternal.h index 17d9028ade7..f8312d9bb33 100644 --- a/components/Snackbar/src/private/MDCSnackbarMessageViewInternal.h +++ b/components/Snackbar/src/private/MDCSnackbarMessageViewInternal.h @@ -93,7 +93,6 @@ typedef void (^MDCSnackbarMessageDismissHandler)(BOOL userInitiated, duration:(NSTimeInterval)duration timingFunction:(CAMediaTimingFunction *_Nullable)timingFunction; - /** Animate the opacity of the Snackbar view. @@ -104,7 +103,6 @@ typedef void (^MDCSnackbarMessageDismissHandler)(BOOL userInitiated, - (CABasicAnimation *_Nullable)animateSnackbarOpacityFrom:(CGFloat)fromOpacity to:(CGFloat)toOpacity; - /** Animate the scale of the Snackbar view. @@ -112,7 +110,6 @@ typedef void (^MDCSnackbarMessageDismissHandler)(BOOL userInitiated, @param toScale scale to finish animation. @return the scale animation. */ -- (CABasicAnimation *_Nullable)animateSnackbarScaleFrom:(CGFloat)fromScale - toScale:(CGFloat)toScale; +- (CABasicAnimation *_Nullable)animateSnackbarScaleFrom:(CGFloat)fromScale toScale:(CGFloat)toScale; @end diff --git a/components/Snackbar/src/private/MaterialSnackbarStrings.h b/components/Snackbar/src/private/MaterialSnackbarStrings.h index 12109a73fd0..8d989b4cecd 100644 --- a/components/Snackbar/src/private/MaterialSnackbarStrings.h +++ b/components/Snackbar/src/private/MaterialSnackbarStrings.h @@ -13,7 +13,8 @@ // limitations under the License. // GENERATED CODE: DO NOT EDIT BY HAND -// GENERATED FROM: components/Snackbar/src/MaterialSnackbar.bundle/Resources/en.lproj/MaterialSnackbar.strings +// GENERATED FROM: +// components/Snackbar/src/MaterialSnackbar.bundle/Resources/en.lproj/MaterialSnackbar.strings // GENERATED BY: generate_string_tables.py typedef enum { diff --git a/components/Snackbar/src/private/MaterialSnackbarStrings_table.h b/components/Snackbar/src/private/MaterialSnackbarStrings_table.h index 01c000224d8..94467d36585 100644 --- a/components/Snackbar/src/private/MaterialSnackbarStrings_table.h +++ b/components/Snackbar/src/private/MaterialSnackbarStrings_table.h @@ -13,7 +13,8 @@ // limitations under the License. // GENERATED CODE: DO NOT EDIT BY HAND -// GENERATED FROM: components/Snackbar/src/MaterialSnackbar.bundle/Resources/en.lproj/MaterialSnackbar.strings +// GENERATED FROM: +// components/Snackbar/src/MaterialSnackbar.bundle/Resources/en.lproj/MaterialSnackbar.strings // GENERATED BY: generate_string_tables.py #import @@ -22,7 +23,7 @@ // This table is to be indexed using the generated enum. static NSString *const kMaterialSnackbarStringTable[] = { - @"MaterialSnackbarMessageViewTitleA11yHint", // Double-tap to dismiss + @"MaterialSnackbarMessageViewTitleA11yHint", // Double-tap to dismiss }; #define kNumMaterialSnackbarStrings 1 #define kMaterialSnackbarStringsOffset 0 diff --git a/components/Tabs/examples/supplemental/TabBarIconExampleSupplemental.h b/components/Tabs/examples/supplemental/TabBarIconExampleSupplemental.h index 08a421d71f7..618c296dbc5 100644 --- a/components/Tabs/examples/supplemental/TabBarIconExampleSupplemental.h +++ b/components/Tabs/examples/supplemental/TabBarIconExampleSupplemental.h @@ -27,13 +27,13 @@ @interface TabBarIconExample : UIViewController -@property(nonatomic, nullable) MDCTabBar * tabBar; -@property(nonatomic, nullable) MDCButton * alignmentButton; -@property(nonatomic, nullable) MDCAppBarViewController * appBarViewController; +@property(nonatomic, nullable) MDCTabBar *tabBar; +@property(nonatomic, nullable) MDCButton *alignmentButton; +@property(nonatomic, nullable) MDCAppBarViewController *appBarViewController; @property(nonatomic, nullable) MDCSemanticColorScheme *colorScheme; @property(nonatomic, nullable) MDCTypographyScheme *typographyScheme; -@property(nonatomic, nullable) UIScrollView * scrollView; -@property(nonatomic, nullable) UIView * starPage; +@property(nonatomic, nullable) UIScrollView *scrollView; +@property(nonatomic, nullable) UIView *starPage; @end @interface TabBarIconExample (Supplemental) diff --git a/components/Tabs/examples/supplemental/TabBarViewControllerExampleSupplemental.h b/components/Tabs/examples/supplemental/TabBarViewControllerExampleSupplemental.h index 7b2d939838e..5087017c306 100644 --- a/components/Tabs/examples/supplemental/TabBarViewControllerExampleSupplemental.h +++ b/components/Tabs/examples/supplemental/TabBarViewControllerExampleSupplemental.h @@ -20,8 +20,8 @@ #import "MaterialButtons+ButtonThemer.h" #import "MaterialColorScheme.h" -#import "MaterialTypographyScheme.h" #import "MaterialTabs.h" +#import "MaterialTypographyScheme.h" typedef void (^MDCButtonActionBlock)(void); diff --git a/components/Tabs/src/ColorThemer/MDCTabBarColorThemer.h b/components/Tabs/src/ColorThemer/MDCTabBarColorThemer.h index 065cff1ddd6..ffdadb94fbd 100644 --- a/components/Tabs/src/ColorThemer/MDCTabBarColorThemer.h +++ b/components/Tabs/src/ColorThemer/MDCTabBarColorThemer.h @@ -53,7 +53,7 @@ instead. Learn more at components/schemes/Color/docs/migration-guide-semantic-color-scheme.md @param colorScheme The color scheme to apply to MDCTabBar. - @param tabBar A MDCTabBar instance to apply a color scheme. + @param tabBar A MDCTabBar instance to apply a color scheme. */ + (void)applyColorScheme:(nonnull id)colorScheme toTabBar:(nonnull MDCTabBar *)tabBar; diff --git a/components/Tabs/src/FontThemer/MDCTabBarFontThemer.h b/components/Tabs/src/FontThemer/MDCTabBarFontThemer.h index 42d24301db1..d588eba92e9 100644 --- a/components/Tabs/src/FontThemer/MDCTabBarFontThemer.h +++ b/components/Tabs/src/FontThemer/MDCTabBarFontThemer.h @@ -34,7 +34,6 @@ @param fontScheme The font scheme to apply to MDCTabBar. @param tabBar A MDCTabBar instance to apply a color scheme. */ -+ (void)applyFontScheme:(nonnull id)fontScheme - toTabBar:(nonnull MDCTabBar *)tabBar; ++ (void)applyFontScheme:(nonnull id)fontScheme toTabBar:(nonnull MDCTabBar *)tabBar; @end diff --git a/components/Tabs/src/MDCTabBar.h b/components/Tabs/src/MDCTabBar.h index 0a6db066be7..81b7babc809 100644 --- a/components/Tabs/src/MDCTabBar.h +++ b/components/Tabs/src/MDCTabBar.h @@ -176,7 +176,7 @@ IB_DESIGNABLE /** Sets the color of the title for the specified state. - + If the @c MDCTabBarItemState value is not set, then defaults to a default value. Therefore, at a minimum, you should set the value for MDCTabBarItemStateNormal. */ diff --git a/components/Tabs/src/MDCTabBarIndicatorTemplate.h b/components/Tabs/src/MDCTabBarIndicatorTemplate.h index cccf4710cdc..2315ce9ddea 100644 --- a/components/Tabs/src/MDCTabBarIndicatorTemplate.h +++ b/components/Tabs/src/MDCTabBarIndicatorTemplate.h @@ -28,7 +28,7 @@ /** Returns an attributes object that describes how the indicator should appear in a given context. */ -- (nonnull MDCTabBarIndicatorAttributes *) - indicatorAttributesForContext:(nonnull id)context; +- (nonnull MDCTabBarIndicatorAttributes *)indicatorAttributesForContext: + (nonnull id)context; @end diff --git a/components/Tabs/src/MDCTabBarViewController.h b/components/Tabs/src/MDCTabBarViewController.h index 9ee146080b0..3af3614aacf 100644 --- a/components/Tabs/src/MDCTabBarViewController.h +++ b/components/Tabs/src/MDCTabBarViewController.h @@ -68,7 +68,7 @@ IB_DESIGNABLE If you provide this method, you can control whether tapping on a tab bar item actually switches to that viewController. If not provided, MDCTabBarViewController will always switch. - + @note The tab bar controller will call this method even when the tapped tab bar item is the currently-selected tab bar item. @@ -86,6 +86,6 @@ IB_DESIGNABLE item is the currently-selected tab bar item. */ - (void)tabBarController:(nonnull MDCTabBarViewController *)tabBarController - didSelectViewController:(nonnull UIViewController *)viewController; + didSelectViewController:(nonnull UIViewController *)viewController; @end diff --git a/components/TextFields/src/ColorThemer/MDCTextFieldColorThemer.h b/components/TextFields/src/ColorThemer/MDCTextFieldColorThemer.h index 071bc26c6e7..9ede9f19a8c 100644 --- a/components/TextFields/src/ColorThemer/MDCTextFieldColorThemer.h +++ b/components/TextFields/src/ColorThemer/MDCTextFieldColorThemer.h @@ -66,7 +66,7 @@ @param textInputController A MDCTextInputController instance to apply a color scheme. */ + (void)applyColorScheme:(nonnull id)colorScheme - toTextInputController:(nonnull id)textInputController; + toTextInputController:(nonnull id)textInputController; /** Applies a color scheme to MDCTextField for all instances of the class diff --git a/components/TextFields/src/FontThemer/MDCTextFieldFontThemer.h b/components/TextFields/src/FontThemer/MDCTextFieldFontThemer.h index 79e420f1317..2f86f7a1f42 100644 --- a/components/TextFields/src/FontThemer/MDCTextFieldFontThemer.h +++ b/components/TextFields/src/FontThemer/MDCTextFieldFontThemer.h @@ -36,7 +36,7 @@ @param textInputController A MDCTextInputController instance that font scheme will be applied to. */ + (void)applyFontScheme:(nonnull id)fontScheme - toTextInputController:(nonnull id)textInputController; + toTextInputController:(nonnull id)textInputController; /** Applies a font scheme to theme a specific class type responding to MDCTextInputController protocol. @@ -46,8 +46,8 @@ @param textInputControllerClass A MDCTextInputController class that font scheme will be applied to. */ + (void)applyFontScheme:(nonnull id)fontScheme - toAllTextInputControllersOfClass:(nonnull Class)textInputControllerClass - NS_SWIFT_NAME(apply(_:toAllControllersOfClass:)); + toAllTextInputControllersOfClass:(nonnull Class)textInputControllerClass + NS_SWIFT_NAME(apply(_:toAllControllersOfClass:)); /** Applies a font scheme to a MDCTextField instance. diff --git a/components/TextFields/src/MDCTextInput.h b/components/TextFields/src/MDCTextInput.h index f9164ce89db..801afed9cbe 100644 --- a/components/TextFields/src/MDCTextInput.h +++ b/components/TextFields/src/MDCTextInput.h @@ -209,12 +209,12 @@ typedef NS_ENUM(NSUInteger, MDCTextInputTextInsetsMode) { @end - /** - Common API for text inputs that support having a leading view. - - MDCTextField implements this protocol but MDCMultilineTextField does not because the designers - determined multiline text fields should only have trailing views. - */ +/** +Common API for text inputs that support having a leading view. + +MDCTextField implements this protocol but MDCMultilineTextField does not because the designers +determined multiline text fields should only have trailing views. +*/ @protocol MDCLeadingViewTextInput /** diff --git a/components/TextFields/src/MDCTextInputController.h b/components/TextFields/src/MDCTextInputController.h index 257ef80c5e1..ea5b343d508 100644 --- a/components/TextFields/src/MDCTextInputController.h +++ b/components/TextFields/src/MDCTextInputController.h @@ -121,7 +121,6 @@ /** Default value for textInputFontDefault. If nil, textInput.font would be the fallback. */ @property(class, nonatomic, nullable, strong) UIFont *textInputFontDefault; - /** The font applied to the placeholder when inline (not floating). @@ -311,7 +310,7 @@ If the TextField is not in an error state helperText is set as the leadingUnderlineLabel's text and helperAccessibilityLabel is set as the leadingUnderlineLabel's accessibilityLabel. */ --(void)setHelperText:(nullable NSString *)helperText +- (void)setHelperText:(nullable NSString *)helperText helperAccessibilityLabel:(nullable NSString *)helperAccessibilityLabel; @end diff --git a/components/TextFields/src/TypographyThemer/MDCTextFieldTypographyThemer.h b/components/TextFields/src/TypographyThemer/MDCTextFieldTypographyThemer.h index 26e457fb32e..b29efc676e1 100644 --- a/components/TextFields/src/TypographyThemer/MDCTextFieldTypographyThemer.h +++ b/components/TextFields/src/TypographyThemer/MDCTextFieldTypographyThemer.h @@ -38,8 +38,8 @@ applied to. */ + (void)applyTypographyScheme:(nonnull id)typographyScheme - toAllTextInputControllersOfClass:(nonnull Class)textInputControllerClass - NS_SWIFT_NAME(apply(_:toAllControllersOfClass:)); + toAllTextInputControllersOfClass:(nonnull Class)textInputControllerClass + NS_SWIFT_NAME(apply(_:toAllControllersOfClass:)); /** Applies a typography scheme's properties to a text input. diff --git a/components/Typography/examples/TypographyCustomFontViewController.h b/components/Typography/examples/TypographyCustomFontViewController.h index f9022918f8d..19325fec8a7 100644 --- a/components/Typography/examples/TypographyCustomFontViewController.h +++ b/components/Typography/examples/TypographyCustomFontViewController.h @@ -16,5 +16,4 @@ @interface TypographyCustomFontViewController : UITableViewController - @end diff --git a/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.h b/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.h index 3d44227c268..91747640a2c 100644 --- a/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.h +++ b/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.h @@ -40,7 +40,7 @@ OBJC_EXTERN NSString *const MDCKeyboardWatcherKeyboardWillChangeFrameNotificatio /** Extract the animation curve option from the keyboard notification */ + (UIViewAnimationOptions)animationCurveOptionFromKeyboardNotification: - (NSNotification *)notification; + (NSNotification *)notification; /** The height of the visible keyboard view. @@ -56,7 +56,7 @@ OBJC_EXTERN NSString *const MDCKeyboardWatcherKeyboardWillChangeFrameNotificatio Zero if the keyboard is not currently showing or is not docked. */ -@property(nonatomic, readonly) CGFloat keyboardOffset __deprecated_msg("Use visibleKeyboardHeight instead of keyboardOffset") -; +@property(nonatomic, readonly) + CGFloat keyboardOffset __deprecated_msg("Use visibleKeyboardHeight instead of keyboardOffset"); @end diff --git a/components/private/Math/src/MDCMath.h b/components/private/Math/src/MDCMath.h index eececf24087..da92cae5fa4 100644 --- a/components/private/Math/src/MDCMath.h +++ b/components/private/Math/src/MDCMath.h @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import -#import #import +#import +#import static inline CGFloat MDCSin(CGFloat value) { #if CGFLOAT_IS_DOUBLE @@ -93,7 +93,9 @@ static inline CGFloat MDCHypot(CGFloat x, CGFloat y) { } // Checks whether the provided floating point number is exactly zero. -static inline BOOL MDCCGFloatIsExactlyZero(CGFloat value) { return (value == 0); } +static inline BOOL MDCCGFloatIsExactlyZero(CGFloat value) { + return (value == 0); +} static inline CGFloat MDCPow(CGFloat value, CGFloat power) { #if CGFLOAT_IS_DOUBLE diff --git a/components/private/ShapeLibrary/src/MDCCurvedRectShapeGenerator.h b/components/private/ShapeLibrary/src/MDCCurvedRectShapeGenerator.h index 36109486365..8fce5cf3eeb 100644 --- a/components/private/ShapeLibrary/src/MDCCurvedRectShapeGenerator.h +++ b/components/private/ShapeLibrary/src/MDCCurvedRectShapeGenerator.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import #import +#import #import "MaterialShapes.h" diff --git a/components/private/ShapeLibrary/src/MDCSlantedRectShapeGenerator.h b/components/private/ShapeLibrary/src/MDCSlantedRectShapeGenerator.h index a366e87b57c..7230e3d88dd 100644 --- a/components/private/ShapeLibrary/src/MDCSlantedRectShapeGenerator.h +++ b/components/private/ShapeLibrary/src/MDCSlantedRectShapeGenerator.h @@ -18,7 +18,7 @@ /** A slanted rectangle shape generator. - + Creates rectangles with the vertical edges at a slant. */ @interface MDCSlantedRectShapeGenerator : NSObject diff --git a/components/private/ShapeLibrary/src/MDCTriangleEdgeTreatment.h b/components/private/ShapeLibrary/src/MDCTriangleEdgeTreatment.h index 5990e741361..1e4a0d1e455 100644 --- a/components/private/ShapeLibrary/src/MDCTriangleEdgeTreatment.h +++ b/components/private/ShapeLibrary/src/MDCTriangleEdgeTreatment.h @@ -39,8 +39,8 @@ typedef enum : NSUInteger { /** Initializes an MDCTriangleEdgeTreatment with a given size and style. */ -- (nonnull instancetype)initWithSize:(CGFloat)size style:(MDCTriangleEdgeStyle)style - NS_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithSize:(CGFloat)size + style:(MDCTriangleEdgeStyle)style NS_DESIGNATED_INITIALIZER; - (nonnull instancetype)init NS_UNAVAILABLE; diff --git a/components/private/Shapes/src/MDCEdgeTreatment.h b/components/private/Shapes/src/MDCEdgeTreatment.h index 563f01b03e0..be646ff000b 100644 --- a/components/private/Shapes/src/MDCEdgeTreatment.h +++ b/components/private/Shapes/src/MDCEdgeTreatment.h @@ -36,4 +36,3 @@ - (nonnull MDCPathGenerator *)pathGeneratorForEdgeWithLength:(CGFloat)length; @end - diff --git a/components/private/Shapes/src/MDCPathGenerator.h b/components/private/Shapes/src/MDCPathGenerator.h index 3ad26f3001a..d8f204b966e 100644 --- a/components/private/Shapes/src/MDCPathGenerator.h +++ b/components/private/Shapes/src/MDCPathGenerator.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import #import +#import /** MDCPathGenerator is a factory for creating CGPaths. Describe your path with the @@ -85,7 +85,7 @@ /** Appends a cubic Bézier curve to the path generator. - + @param controlPoint1 The first control point @param controlPoint2 The second control point @param toPoint The end of the curve @@ -100,8 +100,7 @@ @param controlPoint The control point @param toPoint The end of the curve */ -- (void)addQuadCurveWithControlPoint:(CGPoint)controlPoint - toPoint:(CGPoint)toPoint; +- (void)addQuadCurveWithControlPoint:(CGPoint)controlPoint toPoint:(CGPoint)toPoint; /** Appends the recorded path operations to a CGPath using the provided transform. diff --git a/components/private/Shapes/src/MaterialShapes.h b/components/private/Shapes/src/MaterialShapes.h index 9e589ac908a..0220fa8ee42 100644 --- a/components/private/Shapes/src/MaterialShapes.h +++ b/components/private/Shapes/src/MaterialShapes.h @@ -16,6 +16,6 @@ #import "MDCEdgeTreatment.h" #import "MDCPathGenerator.h" #import "MDCRectangleShapeGenerator.h" +#import "MDCShapeGenerating.h" #import "MDCShapedShadowLayer.h" #import "MDCShapedView.h" -#import "MDCShapeGenerating.h" diff --git a/components/private/ThumbTrack/src/MDCThumbTrack.h b/components/private/ThumbTrack/src/MDCThumbTrack.h index 0873a898a04..78d796f7fc6 100644 --- a/components/private/ThumbTrack/src/MDCThumbTrack.h +++ b/components/private/ThumbTrack/src/MDCThumbTrack.h @@ -263,7 +263,6 @@ */ @property(nullable, nonatomic, strong) UIColor *primaryColor; - @end /** MDCThumbtrack delegate which allows setting custom behavior. */ diff --git a/components/private/ThumbTrack/src/private/MDCThumbTrack+Private.h b/components/private/ThumbTrack/src/private/MDCThumbTrack+Private.h index ccfb4b28f76..4bcd472cf39 100644 --- a/components/private/ThumbTrack/src/private/MDCThumbTrack+Private.h +++ b/components/private/ThumbTrack/src/private/MDCThumbTrack+Private.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "MDCThumbTrack.h" #import "MDCNumericValueLabel.h" +#import "MDCThumbTrack.h" #import "MaterialInk.h" // Credit to the Beacon Tools iOS team for the idea for this implementations diff --git a/components/schemes/Color/src/MDCLegacyTonalColorScheme.h b/components/schemes/Color/src/MDCLegacyTonalColorScheme.h index 46aec4e9ab2..7a76a7f3b6c 100644 --- a/components/schemes/Color/src/MDCLegacyTonalColorScheme.h +++ b/components/schemes/Color/src/MDCLegacyTonalColorScheme.h @@ -29,44 +29,44 @@ @interface MDCTonalColorScheme : NSObject /** The main, primary color used for a theme. */ -@property (nonatomic, strong, nonnull, readonly) UIColor *primaryColor; +@property(nonatomic, strong, nonnull, readonly) UIColor *primaryColor; /** A slightly lighter version of the primary color. Given tonal variations of a color, this color is typically two color swatches lighter than the primary color. */ -@property (nonatomic, strong, nonnull, readonly) UIColor *primaryLightColor; +@property(nonatomic, strong, nonnull, readonly) UIColor *primaryLightColor; /** A slightly darker version of the primary color. Given tonal variations of a color, this color is typically two color swatches darker than the primary color. */ -@property (nonatomic, strong, nonnull, readonly) UIColor *primaryDarkColor; +@property(nonatomic, strong, nonnull, readonly) UIColor *primaryDarkColor; /** The secondary, accent color used for a theme. */ -@property (nonatomic, strong, nonnull, readonly) UIColor *secondaryColor; +@property(nonatomic, strong, nonnull, readonly) UIColor *secondaryColor; /** A slightly lighter version of the secondary color. Given tonal variations of a color, this color is typically two color swatches lighter than the secondary color. */ -@property (nonatomic, strong, nonnull, readonly) UIColor *secondaryLightColor; +@property(nonatomic, strong, nonnull, readonly) UIColor *secondaryLightColor; /** A slightly darker version of the secondary color. Given tonal variations of a color, this color is typically two color swatches darker than the secondary color. */ -@property (nonatomic, strong, nonnull, readonly) UIColor *secondaryDarkColor; +@property(nonatomic, strong, nonnull, readonly) UIColor *secondaryDarkColor; /** The primary tonal palette that provides colors for the color scheme primary colors. */ -@property (nonatomic, strong, nonnull, readonly) MDCTonalPalette *primaryTonalPalette; +@property(nonatomic, strong, nonnull, readonly) MDCTonalPalette *primaryTonalPalette; /** The secondary tonal palette that provides colors for the color scheme secondary colors. */ -@property (nonatomic, strong, nonnull, readonly) MDCTonalPalette *secondaryTonalPalette; +@property(nonatomic, strong, nonnull, readonly) MDCTonalPalette *secondaryTonalPalette; - (nonnull instancetype)init NS_UNAVAILABLE; diff --git a/components/schemes/Color/src/MDCLegacyTonalPalette.h b/components/schemes/Color/src/MDCLegacyTonalPalette.h index 446fd6b10c0..b7db1042bd7 100644 --- a/components/schemes/Color/src/MDCLegacyTonalPalette.h +++ b/components/schemes/Color/src/MDCLegacyTonalPalette.h @@ -27,37 +27,37 @@ /** The colors that comprise a tonal palette. */ -@property (nonatomic, copy, nonnull, readonly) NSArray *colors; +@property(nonatomic, copy, nonnull, readonly) NSArray *colors; /** The index of the main color of a tonal palette. */ -@property (nonatomic, readonly) NSUInteger mainColorIndex; +@property(nonatomic, readonly) NSUInteger mainColorIndex; /** The index of the light color of a tonal palette. */ -@property (nonatomic, readonly) NSUInteger lightColorIndex; +@property(nonatomic, readonly) NSUInteger lightColorIndex; /** The index of the dark color of a tonal palette. */ -@property (nonatomic, readonly) NSUInteger darkColorIndex; +@property(nonatomic, readonly) NSUInteger darkColorIndex; /** The main color of a tonal palette. */ -@property (nonatomic, strong, nonnull, readonly) UIColor *mainColor; +@property(nonatomic, strong, nonnull, readonly) UIColor *mainColor; /** The light color of a tonal palette in relation to the main color. */ -@property (nonatomic, strong, nonnull, readonly) UIColor *lightColor; +@property(nonatomic, strong, nonnull, readonly) UIColor *lightColor; /** The dark color of a tonal palette in relation to the main color. */ -@property (nonatomic, strong, nonnull, readonly) UIColor *darkColor; +@property(nonatomic, strong, nonnull, readonly) UIColor *darkColor; - (nonnull instancetype)init NS_UNAVAILABLE; @@ -70,7 +70,6 @@ - (nonnull instancetype)initWithColors:(nonnull NSArray *)colors mainColorIndex:(NSUInteger)mainColorIndex lightColorIndex:(NSUInteger)lightColorIndex - darkColorIndex:(NSUInteger)darkColorIndex - NS_DESIGNATED_INITIALIZER; + darkColorIndex:(NSUInteger)darkColorIndex NS_DESIGNATED_INITIALIZER; @end diff --git a/components/schemes/Typography/src/MDCTypographyScheme.h b/components/schemes/Typography/src/MDCTypographyScheme.h index 501e7e34c22..a57c5c143b6 100644 --- a/components/schemes/Typography/src/MDCTypographyScheme.h +++ b/components/schemes/Typography/src/MDCTypographyScheme.h @@ -20,7 +20,6 @@ */ @protocol MDCTypographyScheming - /** The headline 1 font. */ diff --git a/demos/Bare/Bare/AppDelegate.h b/demos/Bare/Bare/AppDelegate.h index 6150f054aae..2edcc750ed1 100644 --- a/demos/Bare/Bare/AppDelegate.h +++ b/demos/Bare/Bare/AppDelegate.h @@ -18,6 +18,6 @@ @interface AppDelegate : UIResponder -@property (strong, nonatomic) UIWindow *window; +@property(strong, nonatomic) UIWindow *window; @end diff --git a/demos/Pesto/Pesto/PestoCollectionViewController.h b/demos/Pesto/Pesto/PestoCollectionViewController.h index 1c4d2f65cb8..ec01eb049d6 100644 --- a/demos/Pesto/Pesto/PestoCollectionViewController.h +++ b/demos/Pesto/Pesto/PestoCollectionViewController.h @@ -24,7 +24,8 @@ @optional -- (void)didSelectCell:(PestoCardCollectionViewCell *)cell completion:(void (^)(void))completionBlock; +- (void)didSelectCell:(PestoCardCollectionViewCell *)cell + completion:(void (^)(void))completionBlock; @end diff --git a/demos/Shrine/Shrine/Shrine-Bridging-Header.h b/demos/Shrine/Shrine/Shrine-Bridging-Header.h index e375431a938..d87b745dafa 100644 --- a/demos/Shrine/Shrine/Shrine-Bridging-Header.h +++ b/demos/Shrine/Shrine/Shrine-Bridging-Header.h @@ -13,4 +13,3 @@ See the License for the specific language governing permissions and limitations under the License. */ -