Skip to content

Commit 15fa53b

Browse files
afohrmandsn5ft
authored andcommitted
Remove field prefixes from internal.
PiperOrigin-RevId: 181202757
1 parent e65c6f9 commit 15fa53b

File tree

3 files changed

+198
-198
lines changed

3 files changed

+198
-198
lines changed

lib/java/android/support/design/internal/BottomNavigationItemView.java

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ public class BottomNavigationItemView extends FrameLayout implements MenuView.It
4747

4848
private static final int[] CHECKED_STATE_SET = {android.R.attr.state_checked};
4949

50-
private final int mDefaultMargin;
51-
private final int mShiftAmount;
52-
private final float mScaleUpFactor;
53-
private final float mScaleDownFactor;
50+
private final int defaultMargin;
51+
private final int shiftAmount;
52+
private final float scaleUpFactor;
53+
private final float scaleDownFactor;
5454

55-
private boolean mShiftingMode;
55+
private boolean shiftingMode;
5656
private int labelVisibilityMode;
5757

58-
private ImageView mIcon;
59-
private final TextView mSmallLabel;
60-
private final TextView mLargeLabel;
61-
private int mItemPosition = INVALID_ITEM_POSITION;
58+
private ImageView icon;
59+
private final TextView smallLabel;
60+
private final TextView largeLabel;
61+
private int itemPosition = INVALID_ITEM_POSITION;
6262

63-
private MenuItemImpl mItemData;
63+
private MenuItemImpl itemData;
6464

65-
private ColorStateList mIconTint;
65+
private ColorStateList iconTint;
6666

6767
public BottomNavigationItemView(@NonNull Context context) {
6868
this(context, null);
@@ -78,21 +78,21 @@ public BottomNavigationItemView(Context context, AttributeSet attrs, int defStyl
7878
int inactiveLabelSize = res.getDimensionPixelSize(R.dimen.design_bottom_navigation_text_size);
7979
int activeLabelSize =
8080
res.getDimensionPixelSize(R.dimen.design_bottom_navigation_active_text_size);
81-
mDefaultMargin = res.getDimensionPixelSize(R.dimen.design_bottom_navigation_margin);
82-
mShiftAmount = inactiveLabelSize - activeLabelSize;
83-
mScaleUpFactor = 1f * activeLabelSize / inactiveLabelSize;
84-
mScaleDownFactor = 1f * inactiveLabelSize / activeLabelSize;
81+
defaultMargin = res.getDimensionPixelSize(R.dimen.design_bottom_navigation_margin);
82+
shiftAmount = inactiveLabelSize - activeLabelSize;
83+
scaleUpFactor = 1f * activeLabelSize / inactiveLabelSize;
84+
scaleDownFactor = 1f * inactiveLabelSize / activeLabelSize;
8585

8686
LayoutInflater.from(context).inflate(R.layout.design_bottom_navigation_item, this, true);
8787
setBackgroundResource(R.drawable.design_bottom_navigation_item_background);
88-
mIcon = findViewById(R.id.icon);
89-
mSmallLabel = findViewById(R.id.smallLabel);
90-
mLargeLabel = findViewById(R.id.largeLabel);
88+
icon = findViewById(R.id.icon);
89+
smallLabel = findViewById(R.id.smallLabel);
90+
largeLabel = findViewById(R.id.largeLabel);
9191
}
9292

9393
@Override
9494
public void initialize(MenuItemImpl itemData, int menuType) {
95-
mItemData = itemData;
95+
this.itemData = itemData;
9696
setCheckable(itemData.isCheckable());
9797
setChecked(itemData.isChecked());
9898
setEnabled(itemData.isEnabled());
@@ -105,20 +105,20 @@ public void initialize(MenuItemImpl itemData, int menuType) {
105105
}
106106

107107
public void setItemPosition(int position) {
108-
mItemPosition = position;
108+
itemPosition = position;
109109
}
110110

111111
public int getItemPosition() {
112-
return mItemPosition;
112+
return itemPosition;
113113
}
114114

115115
public void setShiftingMode(boolean enabled) {
116-
if (mShiftingMode != enabled) {
117-
mShiftingMode = enabled;
116+
if (shiftingMode != enabled) {
117+
shiftingMode = enabled;
118118

119-
boolean initialized = mItemData != null;
119+
boolean initialized = itemData != null;
120120
if (initialized) {
121-
setChecked(mItemData.isChecked());
121+
setChecked(itemData.isChecked());
122122
}
123123
}
124124
}
@@ -127,22 +127,22 @@ public void setLabelVisibilityMode(@LabelVisibilityMode int mode) {
127127
if (labelVisibilityMode != mode) {
128128
labelVisibilityMode = mode;
129129

130-
boolean initialized = mItemData != null;
130+
boolean initialized = itemData != null;
131131
if (initialized) {
132-
setChecked(mItemData.isChecked());
132+
setChecked(itemData.isChecked());
133133
}
134134
}
135135
}
136136

137137
@Override
138138
public MenuItemImpl getItemData() {
139-
return mItemData;
139+
return itemData;
140140
}
141141

142142
@Override
143143
public void setTitle(CharSequence title) {
144-
mSmallLabel.setText(title);
145-
mLargeLabel.setText(title);
144+
smallLabel.setText(title);
145+
largeLabel.setText(title);
146146
}
147147

148148
@Override
@@ -152,64 +152,64 @@ public void setCheckable(boolean checkable) {
152152

153153
@Override
154154
public void setChecked(boolean checked) {
155-
mLargeLabel.setPivotX(mLargeLabel.getWidth() / 2);
156-
mLargeLabel.setPivotY(mLargeLabel.getBaseline());
157-
mSmallLabel.setPivotX(mSmallLabel.getWidth() / 2);
158-
mSmallLabel.setPivotY(mSmallLabel.getBaseline());
155+
largeLabel.setPivotX(largeLabel.getWidth() / 2);
156+
largeLabel.setPivotY(largeLabel.getBaseline());
157+
smallLabel.setPivotX(smallLabel.getWidth() / 2);
158+
smallLabel.setPivotY(smallLabel.getBaseline());
159159

160160
switch (labelVisibilityMode) {
161161
case LabelVisibilityMode.LABEL_VISIBILITY_LEGACY:
162-
if (mShiftingMode) {
162+
if (shiftingMode) {
163163
if (checked) {
164-
setViewLayoutParams(mIcon, mDefaultMargin, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
165-
setViewValues(mLargeLabel, 1f, 1f, VISIBLE);
164+
setViewLayoutParams(icon, defaultMargin, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
165+
setViewValues(largeLabel, 1f, 1f, VISIBLE);
166166
} else {
167-
setViewLayoutParams(mIcon, mDefaultMargin, Gravity.CENTER);
168-
setViewValues(mLargeLabel, 0.5f, 0.5f, INVISIBLE);
167+
setViewLayoutParams(icon, defaultMargin, Gravity.CENTER);
168+
setViewValues(largeLabel, 0.5f, 0.5f, INVISIBLE);
169169
}
170-
mSmallLabel.setVisibility(INVISIBLE);
170+
smallLabel.setVisibility(INVISIBLE);
171171
} else {
172172
if (checked) {
173173
setViewLayoutParams(
174-
mIcon, mDefaultMargin + mShiftAmount, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
175-
setViewValues(mLargeLabel, 1f, 1f, VISIBLE);
176-
setViewValues(mSmallLabel, mScaleUpFactor, mScaleUpFactor, INVISIBLE);
174+
icon, defaultMargin + shiftAmount, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
175+
setViewValues(largeLabel, 1f, 1f, VISIBLE);
176+
setViewValues(smallLabel, scaleUpFactor, scaleUpFactor, INVISIBLE);
177177
} else {
178-
setViewLayoutParams(mIcon, mDefaultMargin, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
179-
setViewValues(mLargeLabel, mScaleDownFactor, mScaleDownFactor, INVISIBLE);
180-
setViewValues(mSmallLabel, 1f, 1f, VISIBLE);
178+
setViewLayoutParams(icon, defaultMargin, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
179+
setViewValues(largeLabel, scaleDownFactor, scaleDownFactor, INVISIBLE);
180+
setViewValues(smallLabel, 1f, 1f, VISIBLE);
181181
}
182182
}
183183
break;
184184

185185
case LabelVisibilityMode.LABEL_VISIBILITY_SELECTED:
186186
if (checked) {
187-
setViewLayoutParams(mIcon, mDefaultMargin, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
188-
setViewValues(mLargeLabel, 1f, 1f, VISIBLE);
187+
setViewLayoutParams(icon, defaultMargin, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
188+
setViewValues(largeLabel, 1f, 1f, VISIBLE);
189189
} else {
190-
setViewLayoutParams(mIcon, mDefaultMargin, Gravity.CENTER);
191-
setViewValues(mLargeLabel, 0.5f, 0.5f, INVISIBLE);
190+
setViewLayoutParams(icon, defaultMargin, Gravity.CENTER);
191+
setViewValues(largeLabel, 0.5f, 0.5f, INVISIBLE);
192192
}
193-
mSmallLabel.setVisibility(INVISIBLE);
193+
smallLabel.setVisibility(INVISIBLE);
194194
break;
195195

196196
case LabelVisibilityMode.LABEL_VISIBILITY_LABELED:
197197
if (checked) {
198198
setViewLayoutParams(
199-
mIcon, mDefaultMargin + mShiftAmount, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
200-
setViewValues(mLargeLabel, 1f, 1f, VISIBLE);
201-
setViewValues(mSmallLabel, mScaleUpFactor, mScaleUpFactor, INVISIBLE);
199+
icon, defaultMargin + shiftAmount, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
200+
setViewValues(largeLabel, 1f, 1f, VISIBLE);
201+
setViewValues(smallLabel, scaleUpFactor, scaleUpFactor, INVISIBLE);
202202
} else {
203-
setViewLayoutParams(mIcon, mDefaultMargin, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
204-
setViewValues(mLargeLabel, mScaleDownFactor, mScaleDownFactor, INVISIBLE);
205-
setViewValues(mSmallLabel, 1f, 1f, VISIBLE);
203+
setViewLayoutParams(icon, defaultMargin, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
204+
setViewValues(largeLabel, scaleDownFactor, scaleDownFactor, INVISIBLE);
205+
setViewValues(smallLabel, 1f, 1f, VISIBLE);
206206
}
207207
break;
208208

209209
case LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED:
210-
setViewLayoutParams(mIcon, mDefaultMargin, Gravity.CENTER);
211-
mLargeLabel.setVisibility(GONE);
212-
mSmallLabel.setVisibility(GONE);
210+
setViewLayoutParams(icon, defaultMargin, Gravity.CENTER);
211+
largeLabel.setVisibility(GONE);
212+
smallLabel.setVisibility(GONE);
213213
break;
214214

215215
default:
@@ -235,9 +235,9 @@ private void setViewValues(@NonNull View view, float scaleX, float scaleY, int v
235235
@Override
236236
public void setEnabled(boolean enabled) {
237237
super.setEnabled(enabled);
238-
mSmallLabel.setEnabled(enabled);
239-
mLargeLabel.setEnabled(enabled);
240-
mIcon.setEnabled(enabled);
238+
smallLabel.setEnabled(enabled);
239+
largeLabel.setEnabled(enabled);
240+
icon.setEnabled(enabled);
241241

242242
if (enabled) {
243243
ViewCompat.setPointerIcon(
@@ -250,7 +250,7 @@ public void setEnabled(boolean enabled) {
250250
@Override
251251
public int[] onCreateDrawableState(final int extraSpace) {
252252
final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
253-
if (mItemData != null && mItemData.isCheckable() && mItemData.isChecked()) {
253+
if (itemData != null && itemData.isCheckable() && itemData.isChecked()) {
254254
mergeDrawableStates(drawableState, CHECKED_STATE_SET);
255255
}
256256
return drawableState;
@@ -264,9 +264,9 @@ public void setIcon(Drawable icon) {
264264
if (icon != null) {
265265
Drawable.ConstantState state = icon.getConstantState();
266266
icon = DrawableCompat.wrap(state == null ? icon : state.newDrawable()).mutate();
267-
DrawableCompat.setTintList(icon, mIconTint);
267+
DrawableCompat.setTintList(icon, iconTint);
268268
}
269-
mIcon.setImageDrawable(icon);
269+
this.icon.setImageDrawable(icon);
270270
}
271271

272272
@Override
@@ -280,16 +280,16 @@ public boolean showsIcon() {
280280
}
281281

282282
public void setIconTintList(ColorStateList tint) {
283-
mIconTint = tint;
284-
if (mItemData != null) {
283+
iconTint = tint;
284+
if (itemData != null) {
285285
// Update the icon so that the tint takes effect
286-
setIcon(mItemData.getIcon());
286+
setIcon(itemData.getIcon());
287287
}
288288
}
289289

290290
public void setTextColor(ColorStateList color) {
291-
mSmallLabel.setTextColor(color);
292-
mLargeLabel.setTextColor(color);
291+
smallLabel.setTextColor(color);
292+
largeLabel.setTextColor(color);
293293
}
294294

295295
public void setItemBackground(int background) {

0 commit comments

Comments
 (0)