Skip to content

[TimePicker] Update clock dial selector drawing logic #5044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pubiqq wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −11
Open

[TimePicker] Update clock dial selector drawing logic #5044

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions lib/java/com/google/android/material/timepicker/ClockHandView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package com.google.android.material.timepicker;

import android.graphics.Color;
import androidx.core.graphics.ColorUtils;
import com.google.android.material.R;

import static com.google.android.material.timepicker.RadialViewGroup.LEVEL_1;
Expand Down Expand Up @@ -79,6 +81,7 @@ public interface OnActionUpListener {

private final int selectorRadius;
private final float centerDotRadius;
private final int clockHandColor;
private final Paint paint = new Paint();
// Since the selector moves, overlapping views may need information about
// its current position
Expand Down Expand Up @@ -126,9 +129,8 @@ public ClockHandView(Context context, @Nullable AttributeSet attrs, int defStyle
Resources res = getResources();
selectorStrokeWidth = res.getDimensionPixelSize(R.dimen.material_clock_hand_stroke_width);
centerDotRadius = res.getDimensionPixelSize(R.dimen.material_clock_hand_center_dot_radius);
int selectorColor = a.getColor(R.styleable.ClockHandView_clockHandColor, 0);
clockHandColor = a.getColor(R.styleable.ClockHandView_clockHandColor, 0);
paint.setAntiAlias(true);
paint.setColor(selectorColor);
setHandRotation(0);

scaledTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
Expand Down Expand Up @@ -251,6 +253,16 @@ protected void onDraw(Canvas canvas) {
}

private void drawSelector(Canvas canvas) {
int saveCount = 0;
int clockHandColorAlpha = Color.alpha(clockHandColor);
if (clockHandColorAlpha < 255) {
saveCount = canvas.saveLayerAlpha(null, clockHandColorAlpha);
int clockHandColorOpaque = ColorUtils.setAlphaComponent(clockHandColor, 255);
paint.setColor(clockHandColorOpaque);
} else {
paint.setColor(clockHandColor);
}

int yCenter = getHeight() / 2;
int xCenter = getWidth() / 2;

Expand All @@ -263,18 +275,14 @@ private void drawSelector(Canvas canvas) {
paint.setStrokeWidth(0);
canvas.drawCircle(selCenterX, selCenterY, selectorRadius, paint);

// Shorten the line to only go from the edge of the center dot to the
// edge of the selection circle.
double sin = Math.sin(degRad);
double cos = Math.cos(degRad);
float lineLength = leveledCircleRadius - selectorRadius;
float linePointX = xCenter + (int) (lineLength * cos);
float linePointY = yCenter + (int) (lineLength * sin);

// Draw the line.
paint.setStrokeWidth(selectorStrokeWidth);
canvas.drawLine(xCenter, yCenter, linePointX, linePointY, paint);
canvas.drawLine(xCenter, yCenter, selCenterX, selCenterY, paint);
canvas.drawCircle(xCenter, yCenter, centerDotRadius, paint);

if (clockHandColorAlpha < 255) {
canvas.restoreToCount(saveCount);
}
}

/** Returns the current bounds of the selector, relative to the this view. */
Expand Down