Skip to content

Commit b2fc457

Browse files
committed
Naming
1 parent 7e231ab commit b2fc457

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

composition-avatar/src/main/java/cn/yiiguxing/compositionavatar/CompositionAvatarView.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,10 @@ private void layoutDrawables() {
340340
AvatarDrawable drawable = drawables.get(i);
341341
drawable.reset();
342342

343-
drawable.haveGap = i > 0;
344-
if (drawable.haveGap) {
345-
drawable.gapCenterX = pointsTemp[0];
346-
drawable.gapCenterY = pointsTemp[1];
343+
drawable.mHasGap = i > 0;
344+
if (drawable.mHasGap) {
345+
drawable.mGapCenterX = pointsTemp[0];
346+
drawable.mGapCenterY = pointsTemp[1];
347347
}
348348

349349
pointsTemp[0] = startX;
@@ -354,23 +354,23 @@ private void layoutDrawables() {
354354
matrix.mapPoints(pointsTemp);
355355
}
356356

357-
drawable.centerX = pointsTemp[0];
358-
drawable.centerY = pointsTemp[1];
357+
drawable.mCenterX = pointsTemp[0];
358+
drawable.mCenterY = pointsTemp[1];
359359

360360
drawable.mBounds.inset(-r, -r);
361-
drawable.mBounds.offset(drawable.centerX, drawable.centerY);
361+
drawable.mBounds.offset(drawable.mCenterX, drawable.mCenterY);
362362

363-
drawable.mMaskPath.addCircle(drawable.centerX, drawable.centerY, r,
363+
drawable.mMaskPath.addCircle(drawable.mCenterX, drawable.mCenterY, r,
364364
Path.Direction.CW);
365365
drawable.mMaskPath.setFillType(Path.FillType.INVERSE_WINDING);
366366
}
367367

368368
if (N > 2) {
369369
AvatarDrawable first = drawables.get(0);
370370
AvatarDrawable last = drawables.get(N - 1);
371-
first.haveGap = true;
372-
first.gapCenterX = last.centerX;
373-
first.gapCenterY = last.centerY;
371+
first.mHasGap = true;
372+
first.mGapCenterX = last.mCenterX;
373+
first.mGapCenterY = last.mCenterY;
374374
}
375375

376376
mSteinerCircleRadius = r;
@@ -425,8 +425,8 @@ protected void onDraw(Canvas canvas) {
425425
drawable.mDrawable.draw(canvas);
426426

427427
canvas.drawPath(drawable.mMaskPath, maskPaint);
428-
if (drawable.haveGap && mGap > 0f) {
429-
canvas.drawCircle(drawable.gapCenterX, drawable.gapCenterY, gapRadius, maskPaint);
428+
if (drawable.mHasGap && mGap > 0f) {
429+
canvas.drawCircle(drawable.mGapCenterX, drawable.mGapCenterY, gapRadius, maskPaint);
430430
}
431431

432432
canvas.restoreToCount(savedLayer);
@@ -472,20 +472,20 @@ public void invalidateDrawable(@NonNull Drawable drawable) {
472472
private static class AvatarDrawable {
473473
int mId = View.NO_ID;
474474
Drawable mDrawable;
475-
float centerX;
476-
float centerY;
477-
float gapCenterX;
478-
float gapCenterY;
479-
boolean haveGap;
475+
float mCenterX;
476+
float mCenterY;
477+
float mGapCenterX;
478+
float mGapCenterY;
479+
boolean mHasGap;
480480
final RectF mBounds = new RectF();
481481
final Path mMaskPath = new Path();
482482

483483
void reset() {
484-
centerX = 0;
485-
centerY = 0;
486-
gapCenterX = 0;
487-
gapCenterY = 0;
488-
haveGap = false;
484+
mCenterX = 0;
485+
mCenterY = 0;
486+
mGapCenterX = 0;
487+
mGapCenterY = 0;
488+
mHasGap = false;
489489
mBounds.setEmpty();
490490
mMaskPath.reset();
491491
}

0 commit comments

Comments
 (0)