fix many lint errors/warnings

[mobile-ledger-staging.git] / app / src / main / java / net / ktnx / mobileledger / ui / HueRing.java

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 63a81c9dc280dc340e6f2adfeb0af6ea1b7a8907..71df5bb98f75a98012761b74f8ceed13dea237d9 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/HueRing.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/HueRing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -25,31 +25,31 @@ import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.SweepGradient;
 import android.util.AttributeSet;
-import android.util.Log;
 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 java.util.Locale;
+
+import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class HueRing extends View {
-    private static final int hueStepDegrees = 15;
+    public static final int hueStepDegrees = 5;
     private Paint ringPaint, initialPaint, currentPaint, markerPaint;
-    private int centerX, centerY;
-    private int diameter;
+    private int center;
     private int padding;
     private int initialHueDegrees;
     private int color, hueDegrees;
     private float outerR;
     private float innerR;
     private float bandWidth;
-    private float ringR;
-    private float innerDiameter;
     private float centerR;
-    private RectF centerRect;
-    private RectF ringRect;
+    private final RectF centerRect = new RectF();
+    private final RectF ringRect = new RectF();
     private int markerOverflow;
     private int markerStrokeWidth;
     public HueRing(Context context, @Nullable AttributeSet attrs) {
@@ -113,13 +113,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;
@@ -160,8 +163,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);
@@ -176,6 +179,7 @@ public class HueRing extends View {
         int heightMode = View.MeasureSpec.getMode(heightMeasureSpec);
         int heightSize = View.MeasureSpec.getSize(heightMeasureSpec);
 
+        int diameter;
         if ((widthMode == MeasureSpec.AT_MOST) && (heightMode == MeasureSpec.AT_MOST)) {
             diameter = Math.min(widthSize, heightSize);
         }
@@ -190,26 +194,29 @@ public class HueRing extends View {
 //                getContext().getResources().getDimension(R.dimen.activity_horizontal_margin)) / 2;
         diameter -= 2 * padding;
         outerR = diameter / 2f;
-        centerX = padding + (int) outerR;
-        centerY = centerX;
+        center = padding + (int) outerR;
 
         bandWidth = diameter / 3.5f;
-        ringR = outerR - bandWidth / 2f;
+        float ringR = outerR - bandWidth / 2f;
         innerR = outerR - bandWidth;
 
-        ringRect = new RectF(-ringR, -ringR, ringR, ringR);
+        ringRect.set(-ringR, -ringR, ringR, ringR);
 
-        innerDiameter = diameter - 2 * bandWidth;
+        float innerDiameter = diameter - 2 * bandWidth;
         centerR = innerDiameter * 0.5f;
-        centerRect = new RectF(-centerR, -centerR, centerR, centerR);
+        centerRect.set(-centerR, -centerR, centerR, centerR);
+    }
+    @Override
+    public boolean performClick() {
+        return super.performClick();
     }
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
             case MotionEvent.ACTION_MOVE:
-                float x = event.getX() - centerX;
-                float y = event.getY() - centerY;
+                float x = event.getX() - center;
+                float y = event.getY() - center;
 
                 float dist = (float) Math.hypot(x, y);
 
@@ -223,18 +230,22 @@ 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;
-                Log.d("TMP",
-                        String.format("x=%1.3f, y=%1.3f, angle=%1.3frad, hueDegrees=%1.3f", x, y,
-                                angleRad, hue));
+                if (hue < 0)
+                    hue += 1;
+                debug("TMP", String.format(Locale.US,
+                        "x=%1.3f, y=%1.3f, angle=%1.3f rad, hueDegrees=%1.3f", x, y, angleRad,
+                        hue));
                 setHue(hue);
                 break;
+            case MotionEvent.ACTION_UP:
+                performClick();
+                break;
         }
-
         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();