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

new interface implementation

Browse Source
This commit is contained in:
serso 2011-09-11 17:31:31 +04:00
parent 87aa087ad9
commit cb9e0332a9
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
View File

@ -1,18 +1,9 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.widget.Button;
import android.widget.Toast;
import org.apache.http.Header;
import java.security.KeyStore;
import java.util.List;
import java.util.prefs.PreferencesFactory;
/** /**
* User: serso * User: serso

1
src/org/solovyev/android/calculator/DragButtonCalibrationActivity.java
View File

@ -4,7 +4,6 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.util.Log; import android.util.Log;

6
src/org/solovyev/android/view/ColorButton.java
View File

@ -25,8 +25,6 @@ import android.widget.Button;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.content.res.Resources; import android.content.res.Resources;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R;
import org.solovyev.util.StringUtils;
import org.solovyev.util.math.Point2d; import org.solovyev.util.math.Point2d;
/** /**
@ -60,11 +58,11 @@ public class ColorButton extends Button {
protected void init(Context context) { protected void init(Context context) {
Resources res = getResources(); Resources res = getResources();
CLICK_FEEDBACK_COLOR = res.getColor(R.color.magic_flame); CLICK_FEEDBACK_COLOR = res.getColor(org.solovyev.android.calculator.R.color.magic_flame);
mFeedbackPaint = new Paint(); mFeedbackPaint = new Paint();
mFeedbackPaint.setStyle(Style.STROKE); mFeedbackPaint.setStyle(Style.STROKE);
mFeedbackPaint.setStrokeWidth(2); mFeedbackPaint.setStrokeWidth(2);
getPaint().setColor(res.getColor(R.color.button_text)); getPaint().setColor(res.getColor(org.solovyev.android.calculator.R.color.button_text));
mAnimStart = -1; mAnimStart = -1;

7
src/org/solovyev/android/view/DirectionDragButton.java
View File

@ -4,7 +4,6 @@ import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.text.Html;
import android.text.TextPaint; import android.text.TextPaint;
import android.util.AttributeSet; import android.util.AttributeSet;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -46,16 +45,16 @@ public class DirectionDragButton extends DragButton {
private void init(@NotNull Context context, @NotNull AttributeSet attrs) { private void init(@NotNull Context context, @NotNull AttributeSet attrs) {
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.DragButton); TypedArray a = context.obtainStyledAttributes(attrs, org.solovyev.android.calculator.R.styleable.DragButton);
final int N = a.getIndexCount(); final int N = a.getIndexCount();
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
int attr = a.getIndex(i); int attr = a.getIndex(i);
switch (attr) { switch (attr) {
case R.styleable.DragButton_textUp: case org.solovyev.android.calculator.R.styleable.DragButton_textUp:
this.textUp = a.getString(attr); this.textUp = a.getString(attr);
break; break;
case R.styleable.DragButton_textDown: case org.solovyev.android.calculator.R.styleable.DragButton_textDown:
this.textDown = a.getString(attr); this.textDown = a.getString(attr);
break; break;
} }