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

Remove dep from AngleUnitButton

Browse Source
This commit is contained in:
serso 2016-02-28 13:55:38 +01:00
parent 3edaa64d2d
commit 8a2456d9a4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/solovyev/android/calculator/keyboard/KeyboardUi.java
View File

@ -139,6 +139,7 @@ public class KeyboardUi extends BaseKeyboardUi {
prepareButton(button4); prepareButton(button4);
prepareButton(button5); prepareButton(button5);
prepareButton(button6); prepareButton(button6);
button6.setAngleUnit(angleUnit.getPreference(preferences));
prepareButton(button7); prepareButton(button7);
prepareButton(button8); prepareButton(button8);
prepareButton(button9); prepareButton(button9);

4
app/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
View File

@ -28,7 +28,6 @@ import android.support.v4.content.ContextCompat;
import android.text.TextPaint; import android.text.TextPaint;
import android.util.AttributeSet; import android.util.AttributeSet;
import jscl.AngleUnit; import jscl.AngleUnit;
import org.solovyev.android.calculator.Locator;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.views.dragbutton.DirectionDragButton; import org.solovyev.android.views.dragbutton.DirectionDragButton;
@ -37,11 +36,10 @@ import javax.annotation.Nonnull;
public class AngleUnitsButton extends DirectionDragButton { public class AngleUnitsButton extends DirectionDragButton {
@Nonnull @Nonnull
private AngleUnit angleUnit; private AngleUnit angleUnit = AngleUnit.deg;
public AngleUnitsButton(Context context, @Nonnull AttributeSet attrs) { public AngleUnitsButton(Context context, @Nonnull AttributeSet attrs) {
super(context, attrs); super(context, attrs);
this.angleUnit = Locator.getInstance().getEngine().getMathEngine().getAngleUnits();
} }
@Override @Override