[TextControls] Rename + small refactor of horizontal positioning stuff

PiperOrigin-RevId: 316164753

components/private/TextControlsPrivate/src/BaseStyle/MDCTextControlStyleBase.m

@@ -53,8 +53,8 @@ - (void)removeStyleFrom:(id<MDCTextControl>)textControl {
             preferredContainerHeight:preferredContainerHeight];
 }
 
-- (MDCTextControlHorizontalPositioningReferenceDefault *)horizontalPositioningReference {
-  return [[MDCTextControlHorizontalPositioningReferenceDefault alloc] init];
+- (MDCTextControlHorizontalPositioningReference *)horizontalPositioningReference {
+  return [[MDCTextControlHorizontalPositioningReference alloc] init];
 }
 
 @end

components/private/TextControlsPrivate/src/FilledStyle/MDCTextControlStyleFilled.m

@@ -112,9 +112,9 @@ - (void)removeStyleFrom:(id<MDCTextControl>)textControl {
             preferredContainerHeight:preferredContainerHeight];
 }
 
-- (nonnull MDCTextControlHorizontalPositioningReferenceDefault *)horizontalPositioningReference {
-  MDCTextControlHorizontalPositioningReferenceDefault *positioningReference =
-      [[MDCTextControlHorizontalPositioningReferenceDefault alloc] init];
+- (nonnull MDCTextControlHorizontalPositioningReference *)horizontalPositioningReference {
+  MDCTextControlHorizontalPositioningReference *positioningReference =
+      [[MDCTextControlHorizontalPositioningReference alloc] init];
   return positioningReference;
 }
 

components/private/TextControlsPrivate/src/OutlinedStyle/MDCTextControlStyleOutlined.m

@@ -132,8 +132,8 @@ - (void)removeStyleFrom:(id<MDCTextControl>)TextControl {
             preferredContainerHeight:preferredContainerHeight];
 }
 
-- (MDCTextControlHorizontalPositioningReferenceDefault *)horizontalPositioningReference {
-  return [[MDCTextControlHorizontalPositioningReferenceDefault alloc] init];
+- (MDCTextControlHorizontalPositioningReference *)horizontalPositioningReference {
+  return [[MDCTextControlHorizontalPositioningReference alloc] init];
 }
 
 #pragma mark Internal Styling Methods

components/private/TextControlsPrivate/src/Shared/MDCTextControl.h

@@ -188,6 +188,6 @@ FOUNDATION_EXTERN const CGFloat kMDCTextControlDefaultAnimationDuration;
  This method returns an object that tells the view where to position its views
  horizontally.
  */
-- (nonnull MDCTextControlHorizontalPositioningReferenceDefault *)horizontalPositioningReference;
+- (nonnull MDCTextControlHorizontalPositioningReference *)horizontalPositioningReference;
 
 @end

components/private/TextControlsPrivate/src/Shared/MDCTextControlHorizontalPositioning.h

@@ -0,0 +1,34 @@
+// Copyright 2020-present the Material Components for iOS authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#import <UIKit/UIKit.h>
+
+/**
+ Objects conforming to this protocol provide information to layout objects regarding the horizontal
+ positioning of TextControl subviews.
+ */
+@protocol MDCTextControlHorizontalPositioning
+
+/**
+ The amount of horizontal padding between the leftmost subview and the left edge of the screen as
+ well as the rightmost view and the right edge of the screen.
+*/
+@property(nonatomic, assign) CGFloat horizontalEdgePadding;
+
+/**
+ The amount of horizontal padding between the various subviews.
+*/
+@property(nonatomic, assign) CGFloat horizontalInterItemSpacing;
+
+@end

components/private/TextControlsPrivate/src/Shared/MDCTextControlHorizontalPositioningReference.h

@@ -14,28 +14,11 @@
 
 #import <UIKit/UIKit.h>
 
-/**
- Objects conforming to this protocol provide information to layout objects regarding the horizontal
- positioning of TextControl subviews.
- */
-@protocol MDCTextControlHorizontalPositioningReference
-
-/**
- The amount of horizontal padding between the leftmost subview and the left edge of the screen as
- well as the rightmost view and the right edge of the screen.
-*/
-@property(nonatomic, assign) CGFloat horizontalEdgePadding;
-
-/**
- The amount of horizontal padding between the various subviews.
-*/
-@property(nonatomic, assign) CGFloat horizontalInterItemSpacing;
-
-@end
+#import "MDCTextControlHorizontalPositioning.h"
 
 /**
- A default implementation of @c MDCTextControlHorizontalPositioningReference
+ An object conforming to @c MDCTextControlHorizontalPositioning
  */
-@interface MDCTextControlHorizontalPositioningReferenceDefault
-    : NSObject <MDCTextControlHorizontalPositioningReference>
+@interface MDCTextControlHorizontalPositioningReference
+    : NSObject <MDCTextControlHorizontalPositioning>
 @end

components/private/TextControlsPrivate/src/Shared/MDCTextControlHorizontalPositioningReference.m

@@ -12,35 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MDCTextControlHorizontalPositioningReference.h"
-
 #import <UIKit/UIKit.h>
 
-static const CGFloat kMDCTextControlHorizontalPositioningReferenceDefaultHorizontalEdgePadding =
-    12.0f;
-static const CGFloat
-    kMDCTextControlHorizontalPositioningReferenceDefaultHorizontalInterItemPadding = 12.0f;
+#import "MDCTextControlHorizontalPositioningReference.h"
 
-@interface MDCTextControlHorizontalPositioningReferenceDefault ()
-@end
+static const CGFloat kMDCTextControlHorizontalPositioningReferenceHorizontalEdgePadding = 12.0f;
+static const CGFloat kMDCTextControlHorizontalPositioningReferenceHorizontalInterItemPadding =
+    12.0f;
 
-@implementation MDCTextControlHorizontalPositioningReferenceDefault
+@implementation MDCTextControlHorizontalPositioningReference
 @synthesize horizontalEdgePadding = _horizontalEdgePadding;
 @synthesize horizontalInterItemSpacing = _horizontalInterItemSpacing;
 
 - (instancetype)init {
   self = [super init];
   if (self) {
-    [self commonMDCTextControlHorizontalPositioningReferenceDefaultInit];
+    self.horizontalEdgePadding = kMDCTextControlHorizontalPositioningReferenceHorizontalEdgePadding;
+    self.horizontalInterItemSpacing =
+        kMDCTextControlHorizontalPositioningReferenceHorizontalInterItemPadding;
   }
   return self;
 }
 
-- (void)commonMDCTextControlHorizontalPositioningReferenceDefaultInit {
-  self.horizontalEdgePadding =
-      kMDCTextControlHorizontalPositioningReferenceDefaultHorizontalEdgePadding;
-  self.horizontalInterItemSpacing =
-      kMDCTextControlHorizontalPositioningReferenceDefaultHorizontalInterItemPadding;
-}
-
 @end

components/private/TextControlsPrivate/src/Shared/MaterialTextControlsPrivate+Shared.h

@@ -17,6 +17,7 @@
 #import "MDCTextControlAssistiveLabelViewLayout.h"
 #import "MDCTextControlColorViewModel.h"
 #import "MDCTextControlGradientManager.h"
+#import "MDCTextControlHorizontalPositioning.h"
 #import "MDCTextControlHorizontalPositioningReference.h"
 #import "MDCTextControlLabelAnimation.h"
 #import "MDCTextControlLabelPosition.h"

components/private/TextControlsPrivate/src/TextFields/MDCBaseTextFieldLayout.h

@@ -47,7 +47,7 @@
                 positioningReference:
                     (nonnull id<MDCTextControlVerticalPositioningReference>)positioningReference
       horizontalPositioningReference:
-          (nonnull id<MDCTextControlHorizontalPositioningReference>)horizontalPositioningReference
+          (nonnull id<MDCTextControlHorizontalPositioning>)horizontalPositioningReference
                                 text:(nullable NSString *)text
                                 font:(nonnull UIFont *)font
                         floatingFont:(nonnull UIFont *)floatingFont

components/private/TextControlsPrivate/src/TextFields/MDCBaseTextFieldLayout.m

@@ -27,7 +27,7 @@ - (instancetype)initWithTextFieldSize:(CGSize)textFieldSize
                  positioningReference:
                      (id<MDCTextControlVerticalPositioningReference>)positioningReference
        horizontalPositioningReference:
-           (id<MDCTextControlHorizontalPositioningReference>)horizontalPositioningReference
+           (id<MDCTextControlHorizontalPositioning>)horizontalPositioningReference
                                  text:(NSString *)text
                                  font:(UIFont *)font
                          floatingFont:(UIFont *)floatingFont
@@ -81,7 +81,7 @@ - (void)calculateLayoutWithTextFieldSize:(CGSize)textFieldSize
                     positioningReference:
                         (id<MDCTextControlVerticalPositioningReference>)positioningReference
           horizontalPositioningReference:
-              (id<MDCTextControlHorizontalPositioningReference>)horizontalPositioningReference
+              (id<MDCTextControlHorizontalPositioning>)horizontalPositioningReference
                                     text:(NSString *)text
                                     font:(UIFont *)font
                             floatingFont:(UIFont *)floatingFont

components/private/TextControlsPrivate/src/UnderlinedStyle/MDCTextControlStyleUnderlined.m

@@ -25,6 +25,7 @@
 static const CGFloat kUnderlinedContainerStyleUnderlineWidthThick = 2.0f;
 
 static const CGFloat kUnderlinedFloatingLabelScaleFactor = 0.75f;
+static const CGFloat kUnderlinedHorizontalEdgePaddingDefault = 2;
 
 @interface MDCTextControlStyleUnderlined () <CAAnimationDelegate>
 
@@ -127,10 +128,10 @@ - (UIFont *)floatingFontWithNormalFont:(UIFont *)font {
   return [font fontWithSize:floatingFontSize];
 }
 
-- (nonnull MDCTextControlHorizontalPositioningReferenceDefault *)horizontalPositioningReference {
-  MDCTextControlHorizontalPositioningReferenceDefault *positioningReference =
-      [[MDCTextControlHorizontalPositioningReferenceDefault alloc] init];
-  positioningReference.horizontalEdgePadding = 2;
+- (nonnull MDCTextControlHorizontalPositioningReference *)horizontalPositioningReference {
+  MDCTextControlHorizontalPositioningReference *positioningReference =
+      [[MDCTextControlHorizontalPositioningReference alloc] init];
+  positioningReference.horizontalEdgePadding = kUnderlinedHorizontalEdgePaddingDefault;
   return positioningReference;
 }
 

components/private/TextControlsPrivate/tests/unit/TextFields/MDCBaseTextFieldLayoutTests.m

@@ -48,8 +48,7 @@ - (MDCBaseTextFieldLayout *)createLayoutWithSideViewsAndViewMode:(UITextFieldVie
   MDCBaseTextFieldLayout *layout = [[MDCBaseTextFieldLayout alloc]
                  initWithTextFieldSize:textFieldSize
                   positioningReference:positioningReference
-        horizontalPositioningReference:[[MDCTextControlHorizontalPositioningReferenceDefault alloc]
-                                           init]
+        horizontalPositioningReference:[[MDCTextControlHorizontalPositioningReference alloc] init]
                                   text:@"Text"
                                   font:font
                           floatingFont:floatingFont