diff --git a/entry/src/main/java/es/guiguegon/elyeproj/sampleloaderview/MainAbility.java b/entry/src/main/java/es/guiguegon/elyeproj/sampleloaderview/MainAbility.java index 2a3c63bb17832620a122b673caebe7cf3dde6714..5b35888023cd216a4c3c0af5738cfd15451b8b65 100644 --- a/entry/src/main/java/es/guiguegon/elyeproj/sampleloaderview/MainAbility.java +++ b/entry/src/main/java/es/guiguegon/elyeproj/sampleloaderview/MainAbility.java @@ -15,26 +15,26 @@ import java.io.IOException; public class MainAbility extends Ability implements Component.ClickedListener { - private int WAIT_DURATION = 5000; - private LoaderImageView icon_img; + private final int WAIT_DURATION = 5000; + private LoaderImageView iconImg; private LoaderTextView name; private LoaderTextView title; private LoaderTextView phone; private LoaderTextView email; - private Button btn_reset; + private Button btnReset; private TaskDispatcher taskDispatcher; @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_main); - icon_img = (LoaderImageView) findComponentById(ResourceTable.Id_image_icon); + iconImg = (LoaderImageView) findComponentById(ResourceTable.Id_image_icon); name = (LoaderTextView) findComponentById(ResourceTable.Id_txt_names); title = (LoaderTextView) findComponentById(ResourceTable.Id_txt_title); phone = (LoaderTextView) findComponentById(ResourceTable.Id_txt_phone); email = (LoaderTextView) findComponentById(ResourceTable.Id_txt_email); - btn_reset = (Button) findComponentById(ResourceTable.Id_btn_reset); - btn_reset.setClickedListener(this::onClick); + btnReset = (Button) findComponentById(ResourceTable.Id_btn_reset); + btnReset.setClickedListener(this::onClick); loadData(); } @@ -53,7 +53,7 @@ public class MainAbility extends Ability implements Component.ClickedListener { try { Resource resource = getResourceManager().getResource(ResourceTable.Media_trump); PixelMapElement pixelMapElement = new PixelMapElement(resource); - icon_img.setImageElement(pixelMapElement); + iconImg.setImageElement(pixelMapElement); } catch (IOException e) { e.printStackTrace(); } catch (NotExistException e) { @@ -69,7 +69,7 @@ public class MainAbility extends Ability implements Component.ClickedListener { title.resetLoader(); phone.resetLoader(); email.resetLoader(); - icon_img.resetLoader(); + iconImg.resetLoader(); loadData(); } diff --git a/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/AttrValue.java b/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/AttrValue.java index 6b726f569e94eb00754e3359c9724b1e70c87525..50c7f84f1caa046fe51274b8a70a4d15b260f063 100644 --- a/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/AttrValue.java +++ b/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/AttrValue.java @@ -116,9 +116,9 @@ public class AttrValue { * @return boolean * */ public static boolean isEmpty(String str){ - boolean isEmpty; + boolean isEmpty; if(str == null || str.equals("")){ - isEmpty = true; + isEmpty = true; }else { isEmpty = false; } diff --git a/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/LoaderController.java b/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/LoaderController.java index e602bc45566971167878cf43cf6b79eeab369606..93804c54952b9c93320dc88eb81b022d445707df 100644 --- a/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/LoaderController.java +++ b/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/LoaderController.java @@ -59,16 +59,16 @@ class LoaderController implements AnimatorValue.ValueUpdateListener { onDraw(canvas, 0, 0, 0, 0); } - public void onDraw(Canvas canvas, float left_pad, float top_pad, float right_pad, float bottom_pad) { - float margin_height = height * (1 - heightWeight) / 2; + public void onDraw(Canvas canvas, float leftPad, float topPad, float rightPad, float bottomPad) { + float marginHeight = height * (1 - heightWeight) / 2; rectPaint.setAlpha(progress); if (useGradient) { prepareGradient(width * widthWeight); } - canvas.drawRoundRect(new RectFloat(0 + left_pad, - margin_height + top_pad, - width * widthWeight - right_pad, - height - margin_height - bottom_pad), + canvas.drawRoundRect(new RectFloat(0 + leftPad, + marginHeight + topPad, + width * widthWeight - rightPad, + height - marginHeight - bottomPad), corners, corners, rectPaint); } @@ -113,11 +113,13 @@ class LoaderController implements AnimatorValue.ValueUpdateListener { } private float validateWeight(float weight) { - if (weight > LoaderConstant.MAX_WEIGHT) + if (weight > LoaderConstant.MAX_WEIGHT) { return LoaderConstant.MAX_WEIGHT; - if (weight < LoaderConstant.MIN_WEIGHT) + } else if(weight < LoaderConstant.MIN_WEIGHT) { return LoaderConstant.MIN_WEIGHT; - return weight; + } else { + return weight; + } } public void stopLoading() { diff --git a/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/LoaderImageView.java b/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/LoaderImageView.java index 36e0547ac8539dc41ce35f5f09ae36b61b163a81..655bbfd8d3e867e80092718f5f67fc6dcb84116d 100644 --- a/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/LoaderImageView.java +++ b/loaderviewlibrary/src/main/java/es/guiguegon/elyeproj/loaderviewlibrary/LoaderImageView.java @@ -110,7 +110,6 @@ public class LoaderImageView extends Image implements LoaderView, Component.Draw @Override public void onDraw(Component component, Canvas canvas) { - System.out.println("------ getWidth() = " + getWidth()); loaderController.setWidth(getWidth()); loaderController.setHeight(getHeight()); loaderController.onDraw(canvas);