Refactor dpToPx method into ViewUtils

PiperOrigin-RevId: 235243747

Author: gsajith

lib/java/com/google/android/material/chip/Chip.java

@@ -22,7 +22,6 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Outline;
 import android.graphics.PorterDuff.Mode;
@@ -67,7 +66,6 @@
 import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -285,7 +283,8 @@ private void initMinTouchTarget(Context context, AttributeSet attrs, int defStyl
             R.style.Widget_MaterialComponents_Chip_Action);
     ensureMinTouchTargetSize = a.getBoolean(R.styleable.Chip_ensureMinTouchTargetSize, false);
 
-    float defaultMinTouchTargetSize = (float) Math.ceil(dpToPx(MIN_TOUCH_TARGET_DP, getContext()));
+    float defaultMinTouchTargetSize =
+        (float) Math.ceil(ViewUtils.dpToPx(getContext(), MIN_TOUCH_TARGET_DP));
     minTouchTargetSize =
         (int)
             Math.ceil(
@@ -2301,9 +2300,4 @@ private void insetChipBackgroundDrawable(
     insetBackgroundDrawable =
         new InsetDrawable(chipDrawable, insetLeft, insetTop, insetRight, insetBottom);
   }
-
-  private static float dpToPx(@Dimension(unit = Dimension.DP) int dp, Context context) {
-    Resources r = context.getResources();
-    return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
-  }
 }

lib/java/com/google/android/material/internal/ViewUtils.java

@@ -18,9 +18,13 @@
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 
+import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.PorterDuff;
+import androidx.annotation.Dimension;
 import androidx.annotation.RestrictTo;
 import androidx.core.view.ViewCompat;
+import android.util.TypedValue;
 import android.view.View;
 
 /**
@@ -52,4 +56,9 @@ public static PorterDuff.Mode parseTintMode(int value, PorterDuff.Mode defaultMo
   public static boolean isLayoutRtl(View view) {
     return ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_RTL;
   }
+
+  public static float dpToPx(Context context, @Dimension(unit = Dimension.DP) int dp) {
+    Resources r = context.getResources();
+    return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+  }
 }

lib/java/com/google/android/material/tabs/TabLayout.java

@@ -1545,11 +1545,6 @@ private void updateTabViewLayoutParams(LinearLayout.LayoutParams lp) {
     }
   }
 
-  @Dimension(unit = Dimension.PX)
-  int dpToPx(@Dimension(unit = Dimension.DP) int dps) {
-    return Math.round(getResources().getDisplayMetrics().density * dps);
-  }
-
   @Override
   protected void onDraw(Canvas canvas) {
     // Draw tab background layer for each tab item
@@ -1567,7 +1562,11 @@ protected void onDraw(Canvas canvas) {
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     // If we have a MeasureSpec which allows us to decide our height, try and use the default
     // height
-    final int idealHeight = dpToPx(getDefaultHeight()) + getPaddingTop() + getPaddingBottom();
+    final int idealHeight =
+        (int)
+            (ViewUtils.dpToPx(getContext(), getDefaultHeight())
+                + getPaddingTop()
+                + getPaddingBottom());
     switch (MeasureSpec.getMode(heightMeasureSpec)) {
       case MeasureSpec.AT_MOST:
         heightMeasureSpec =
@@ -1588,7 +1587,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
       tabMaxWidth =
           requestedTabMaxWidth > 0
               ? requestedTabMaxWidth
-              : specWidth - dpToPx(TAB_MIN_WIDTH_MARGIN);
+              : (int) (specWidth - ViewUtils.dpToPx(getContext(), TAB_MIN_WIDTH_MARGIN));
     }
 
     // Now super measure itself using the (possibly) modified height spec
@@ -2495,7 +2494,7 @@ private void updateTextAndIcon(
         int iconMargin = 0;
         if (hasText && iconView.getVisibility() == VISIBLE) {
           // If we're showing both text and icon, add some margin bottom to the icon
-          iconMargin = dpToPx(DEFAULT_GAP_TEXT_ICON);
+          iconMargin = (int) ViewUtils.dpToPx(getContext(), DEFAULT_GAP_TEXT_ICON);
         }
         if (inlineLabel) {
           if (iconMargin != MarginLayoutParamsCompat.getMarginEnd(lp)) {
@@ -2653,7 +2652,7 @@ protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec
           return;
         }
 
-        final int gutter = dpToPx(FIXED_WRAP_GUTTER_MIN);
+        final int gutter = (int) ViewUtils.dpToPx(getContext(), FIXED_WRAP_GUTTER_MIN);
         boolean remeasure = false;
 
         if (largestTabWidth * count <= getMeasuredWidth() - gutter * 2) {
@@ -2815,9 +2814,10 @@ public void onAnimationEnd(Animator animator) {
      */
     private void calculateTabViewContentBounds(TabView tabView, RectF contentBounds) {
       int tabViewContentWidth = tabView.getContentWidth();
+      int minIndicatorWidth = (int) ViewUtils.dpToPx(getContext(), MIN_INDICATOR_WIDTH);
 
-      if (tabViewContentWidth < dpToPx(MIN_INDICATOR_WIDTH)) {
-        tabViewContentWidth = dpToPx(MIN_INDICATOR_WIDTH);
+      if (tabViewContentWidth < minIndicatorWidth) {
+        tabViewContentWidth = minIndicatorWidth;
       }
 
       int tabViewCenter = (tabView.getLeft() + tabView.getRight()) / 2;