TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use offsets for positions as view's height/width might be changed

Browse Source
This commit is contained in:
serso 2016-03-14 21:04:47 +01:00
parent 6aa5ea4d0c
commit bc8886fe65
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/org/solovyev/android/views/dragbutton/DirectionTextView.java
View File

@ -90,9 +90,9 @@ public class DirectionTextView {
@NonNull @NonNull
private final View view; private final View view;
private final float minTextSize; private final float minTextSize;
private float fixedTextHeight = 0;
@NonNull @NonNull
private final PointF position = new PointF(-1, -1); private final PointF offset = new PointF(0, 0);
private float fixedTextHeight = 0;
@NonNull @NonNull
private String value = ""; private String value = "";
private float scale; private float scale;
@ -174,7 +174,7 @@ public class DirectionTextView {
Check.isNotNull(view); Check.isNotNull(view);
view.invalidate(); view.invalidate();
if (remeasure) { if (remeasure) {
position.set(-1, -1); offset.set(0, 0);
} }
} }
@ -182,10 +182,25 @@ public class DirectionTextView {
if (!hasValue()) { if (!hasValue()) {
return; return;
} }
if (position.x < 0 || position.y < 0) { if (offset.x == 0 && offset.y == 0) {
calculatePosition(); calculatePosition();
} }
canvas.drawText(value, position.x, position.y, paint); final int width = view.getWidth();
final int height = view.getHeight();
switch (direction) {
case up:
canvas.drawText(value, width + offset.x, offset.y, paint);
break;
case down:
canvas.drawText(value, width + offset.x, height + offset.y, paint);
break;
case left:
canvas.drawText(value, offset.x, height / 2 + offset.y, paint);
break;
case right:
canvas.drawText(value, width + offset.x, height / 2 + offset.y, paint);
break;
}
} }
private void calculatePosition() { private void calculatePosition() {
@ -200,22 +215,21 @@ public class DirectionTextView {
switch (direction) { switch (direction) {
case up: case up:
case down: case down:
position.x = view.getWidth() - paddingLeft - bounds.width(); offset.x = -paddingLeft - bounds.width();
if (direction == DragDirection.up) { if (direction == DragDirection.up) {
position.y = paddingTop + fixedTextHeight; offset.y = paddingTop + fixedTextHeight;
} else { } else {
position.y = view.getHeight() - paddingBottom; offset.y = -paddingBottom;
} }
break; break;
case left: case left:
case right: case right:
if (direction == DragDirection.left) { if (direction == DragDirection.left) {
position.x = paddingLeft; offset.x = paddingLeft;
} else { } else {
position.x = view.getWidth() - paddingRight - bounds.width(); offset.x = -paddingRight - bounds.width();
} }
final int availableHeight = view.getHeight() - verticalPaddings; offset.y = paddingTop - verticalPaddings / 2 + fixedTextHeight / 2;
position.y = paddingTop + availableHeight / 2 + fixedTextHeight / 2;
break; break;
} }
} }
@ -225,10 +239,6 @@ public class DirectionTextView {
return visible ? value : ""; return visible ? value : "";
} }
public boolean hasValue() {
return visible && !TextUtils.isEmpty(value);
}
public void setValue(@NonNull String value) { public void setValue(@NonNull String value) {
if (TextUtils.equals(this.value, value)) { if (TextUtils.equals(this.value, value)) {
return; return;
@ -236,5 +246,9 @@ public class DirectionTextView {
this.value = value; this.value = value;
invalidate(true); invalidate(true);
} }
public boolean hasValue() {
return visible && !TextUtils.isEmpty(value);
}
} }
} }