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

Library upgrade

Browse Source
This commit is contained in:
serso
2014-07-27 12:33:53 +02:00
parent 9c7826fadc
commit 16beb057c2
12 changed files with 161 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
android-app-core/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
View File

@@ -28,13 +28,12 @@ import android.graphics.Paint;
import android.text.TextPaint;
import android.util.AttributeSet;
import jscl.AngleUnit;
import javax.annotation.Nonnull;
import org.solovyev.android.calculator.Locator;
import org.solovyev.android.calculator.core.R;
import org.solovyev.android.view.drag.DirectionDragButton;
import javax.annotation.Nonnull;
/**
* User: serso
* Date: 11/22/11
@@ -51,16 +50,16 @@ public class AngleUnitsButton extends DirectionDragButton {
}
@Override
protected void initDirectionTextPaint(@Nonnull Paint basePaint,
@Nonnull DirectionTextData directionTextData,
@Nonnull Resources resources) {
super.initDirectionTextPaint(basePaint, directionTextData, resources);
protected void initDirectionTextPaint(@Nonnull Paint basePaint, @Nonnull DirectionTextData textData) {
super.initDirectionTextPaint(basePaint, textData);
final TextPaint directionTextPaint = directionTextData.getPaint();
final int color = getDirectionTextColor(directionTextData.getText());
directionTextPaint.setColor(color);
if (!isCurrentAngleUnits(directionTextData.getText())) {
directionTextPaint.setAlpha(getDirectionTextAlpha());
final String text = textData.getText();
final TextPaint paint = textData.getPaint();
final int color = getDirectionTextColor(text);
paint.setColor(color);
if (!isCurrentAngleUnits(text)) {
paint.setAlpha(directionTextAlpha);
}
}

24
android-app-core/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
View File

@@ -23,18 +23,16 @@
package org.solovyev.android.calculator.view;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Paint;
import android.text.TextPaint;
import android.util.AttributeSet;
import jscl.NumeralBase;
import javax.annotation.Nonnull;
import org.solovyev.android.calculator.Locator;
import org.solovyev.android.calculator.core.R;
import org.solovyev.android.view.drag.DirectionDragButton;
import javax.annotation.Nonnull;
/**
* User: serso
* Date: 12/8/11
@@ -51,18 +49,16 @@ public class NumeralBasesButton extends DirectionDragButton {
}
@Override
protected void initDirectionTextPaint(@Nonnull Paint basePaint,
@Nonnull DirectionTextData directionTextData,
@Nonnull Resources resources) {
super.initDirectionTextPaint(basePaint, directionTextData, resources);
protected void initDirectionTextPaint(@Nonnull Paint basePaint, @Nonnull DirectionTextData textData) {
super.initDirectionTextPaint(basePaint, textData);
final TextPaint directionTextPaint = directionTextData.getPaint();
final String text = textData.getText();
final TextPaint paint = textData.getPaint();
final int color = getDirectionTextColor(directionTextData.getText());
directionTextPaint.setColor(color);
if (!isCurrentNumberBase(directionTextData.getText())) {
directionTextPaint.setAlpha(getDirectionTextAlpha());
final int color = getDirectionTextColor(text);
paint.setColor(color);
if (!isCurrentNumberBase(text)) {
paint.setAlpha(directionTextAlpha);
}
}