X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2FHueRing.java;h=006cd4ba7c0480031cbeaa30dc1becae8b11552d;hp=c97741a9b1f4e98a4559c4b709a53f69b107d360;hb=c27aa72c2c641bcd568692b4a20b125605cfb3b5;hpb=4f8b4f8bf16aaef182e1aac31a34f88a2adf5fa8 diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/HueRing.java b/app/src/main/java/net/ktnx/mobileledger/ui/HueRing.java index c97741a9..006cd4ba 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/HueRing.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/HueRing.java @@ -28,10 +28,11 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; +import androidx.annotation.Nullable; + import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.DimensionUtils; -import androidx.annotation.Nullable; import static net.ktnx.mobileledger.utils.Logger.debug; @@ -114,13 +115,16 @@ public class HueRing extends View { return hueDegrees; } public void setHue(int hueDegrees) { - if (hueDegrees == -1) hueDegrees = Colors.DEFAULT_HUE_DEG; + if (hueDegrees == -1) + hueDegrees = Colors.DEFAULT_HUE_DEG; if (hueDegrees != Colors.DEFAULT_HUE_DEG) { // round to 15 degrees int rem = hueDegrees % hueStepDegrees; - if (rem < (hueStepDegrees / 2)) hueDegrees -= rem; - else hueDegrees += hueStepDegrees - rem; + if (rem < (hueStepDegrees / 2)) + hueDegrees -= rem; + else + hueDegrees += hueStepDegrees - rem; } this.hueDegrees = hueDegrees; @@ -161,8 +165,8 @@ public class HueRing extends View { // p.arcTo(-innerEdge, -innerEdge, innerEdge, innerEdge, -hueStepDegrees / 2f, // hueStepDegrees, true); // p.lineTo(outerEdge * cr, outerEdge * sr); - p.arcTo(-outerEdge, -outerEdge, outerEdge, outerEdge, hueStepDegrees / 2f, - -hueStepDegrees, false); + p.arcTo(-outerEdge, -outerEdge, outerEdge, outerEdge, hueStepDegrees / 2f, -hueStepDegrees, + false); // p.close(); canvas.save(); canvas.translate(center, center); @@ -224,7 +228,8 @@ public class HueRing extends View { float angleRad = (float) Math.atan2(y, x); // angleRad is [-𝜋; +𝜋] float hue = (float) (angleRad / (2 * Math.PI)); - if (hue < 0) hue += 1; + if (hue < 0) + hue += 1; debug("TMP", String.format("x=%1.3f, y=%1.3f, angle=%1.3frad, hueDegrees=%1.3f", x, y, angleRad, hue)); @@ -235,7 +240,8 @@ public class HueRing extends View { return true; } public void setInitialHue(int initialHue) { - if (initialHue == -1) initialHue = Colors.DEFAULT_HUE_DEG; + if (initialHue == -1) + initialHue = Colors.DEFAULT_HUE_DEG; this.initialHueDegrees = initialHue; this.initialPaint.setColor(Colors.getPrimaryColorForHue(initialHue)); invalidate();