feat: Adjust codestyle in CheckmarkWidgetView

pull/643/head
Christoph Hennemann 5 years ago
parent 5403ca3ef4
commit dc25024c0f

@ -19,7 +19,6 @@
package org.isoron.uhabits.widgets.views; package org.isoron.uhabits.widgets.views;
import android.content.*; import android.content.*;
import android.util.*; import android.util.*;
import android.widget.*; import android.widget.*;
@ -36,9 +35,6 @@ import org.isoron.uhabits.utils.*;
import static org.isoron.androidbase.utils.InterfaceUtils.getDimension; import static org.isoron.androidbase.utils.InterfaceUtils.getDimension;
public class CheckmarkWidgetView extends HabitWidgetView { public class CheckmarkWidgetView extends HabitWidgetView {
protected int activeColor; protected int activeColor;
@ -57,20 +53,20 @@ public class CheckmarkWidgetView extends HabitWidgetView {
protected boolean isNumerical; protected boolean isNumerical;
public CheckmarkWidgetView(Context context)
public CheckmarkWidgetView(Context context) { {
super(context); super(context);
init(); init();
} }
public CheckmarkWidgetView(Context context, AttributeSet attrs)
public CheckmarkWidgetView(Context context, AttributeSet attrs) { {
super(context, attrs); super(context, attrs);
init(); init();
} }
public void refresh()
public void refresh() { {
if (backgroundPaint == null || frame == null || ring == null) { if (backgroundPaint == null || frame == null || ring == null) {
return; return;
} }
@ -95,29 +91,22 @@ public class CheckmarkWidgetView extends HabitWidgetView {
ring.setPercentage(percentage); ring.setPercentage(percentage);
ring.setColor(fgColor); ring.setColor(fgColor);
ring.setBackgroundColor(bgColor); ring.setBackgroundColor(bgColor);
ring.setText( ring.setText(getText());
getText());
label.setText(name); label.setText(name);
label.setTextColor(fgColor); label.setTextColor(fgColor);
requestLayout(); requestLayout();
postInvalidate(); postInvalidate();
} }
public void setCheckmarkState(CheckmarkState checkmarkState)
public void setCheckmarkState(CheckmarkState checkmarkState) { {
this.checkmarkState = checkmarkState; this.checkmarkState = checkmarkState;
} }
protected String getText()
protected String getText() { {
if (isNumerical) { if (isNumerical) {
return NumberButtonViewKt.toShortString(checkmarkState.getValue() / 1000.0); return NumberButtonViewKt.toShortString(checkmarkState.getValue() / 1000.0);
} }
@ -132,36 +121,36 @@ public class CheckmarkWidgetView extends HabitWidgetView {
} }
} }
public void setActiveColor(int activeColor)
public void setActiveColor(int activeColor) { {
this.activeColor = activeColor; this.activeColor = activeColor;
} }
public void setName(@NonNull String name)
public void setName(@NonNull String name) { {
this.name = name; this.name = name;
} }
public void setPercentage(float percentage)
public void setPercentage(float percentage) { {
this.percentage = percentage; this.percentage = percentage;
} }
public void setNumerical(boolean isNumerical)
public void setNumerical(boolean isNumerical) { {
this.isNumerical = isNumerical; this.isNumerical = isNumerical;
} }
@Override @Override
@NonNull @NonNull
protected Integer getInnerLayoutId() { protected Integer getInnerLayoutId()
{
return R.layout.widget_checkmark; return R.layout.widget_checkmark;
} }
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
{
int width = MeasureSpec.getSize(widthMeasureSpec); int width = MeasureSpec.getSize(widthMeasureSpec);
int height = MeasureSpec.getSize(heightMeasureSpec); int height = MeasureSpec.getSize(heightMeasureSpec);
@ -194,8 +183,8 @@ public class CheckmarkWidgetView extends HabitWidgetView {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} }
private void init()
private void init() { {
ring = (RingView) findViewById(R.id.scoreRing); ring = (RingView) findViewById(R.id.scoreRing);
label = (TextView) findViewById(R.id.label); label = (TextView) findViewById(R.id.label);

Loading…
Cancel
Save