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

Changes

Browse Source
This commit is contained in:
Sergey Solovyev
2012-11-18 16:58:33 +04:00
parent 344018a44c
commit b3396d0ffe
63 changed files with 208 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
View File

@@ -106,7 +106,7 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
AndroidCalculatorDisplayView.this.state = state;
if (state.isValid()) {
setTextColor(getResources().getColor(R.color.default_text_color));
setTextColor(getResources().getColor(R.color.cpp_default_text_color));
setText(text);
adjustTextSize();
@@ -114,7 +114,7 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
} else {
// update text in order to get rid of HTML tags
setText(getText().toString());
setTextColor(getResources().getColor(R.color.display_error_text_color));
setTextColor(getResources().getColor(R.color.cpp_display_error_text_color));
// error messages are never shown -> just greyed out text (error message will be shown on click)
//setText(state.getErrorMessage());

2
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
View File

@@ -39,7 +39,7 @@ public final class CalculatorButtons {
@NotNull View root) {
if ( layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile ) {
final float textSize = root.getResources().getDimension(R.dimen.button_text_size_mobile);
final float textSize = root.getResources().getDimension(R.dimen.cpp_button_text_size_mobile);
AndroidUtils.processViewsOfType(root, DragButton.class, new AndroidUtils.ViewProcessor<DragButton>() {
@Override

4
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
View File

@@ -49,8 +49,8 @@ public class CalculatorMessagesDialog extends SherlockActivity {
final CheckBox doNotShowCalculationMessagesCheckbox = (CheckBox) findViewById(R.id.do_not_show_calculation_messages_checkbox);
final Button okButton = (Button) findViewById(R.id.ok_button);
okButton.setOnClickListener(new View.OnClickListener() {
final Button closeButton = (Button) findViewById(R.id.close_button);
closeButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (doNotShowCalculationMessagesCheckbox.isChecked()) {

2
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
View File

@@ -183,11 +183,11 @@ public final class CalculatorPreferences {
applyDefaultPreference(preferences, Calculations.calculateOnFly);
applyDefaultPreference(preferences, Calculations.preferredAngleUnits);
applyDefaultPreference(preferences, Calculations.preferredNumeralBase);
applyDefaultPreference(preferences, Calculations.lastPreferredPreferencesCheck);
// renew value after each application start
Calculations.showCalculationMessagesDialog.putDefault(preferences);
Calculations.lastPreferredPreferencesCheck.putDefault(preferences);
if (!VibratorContainer.Preferences.hapticFeedbackEnabled.isSet(preferences)) {
VibratorContainer.Preferences.hapticFeedbackEnabled.putPreference(preferences, true);

2
calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
View File

@@ -108,7 +108,7 @@ public class CalculatorPlotFragment extends CalculatorFragment implements Calcul
}
if (input == null) {
this.bgColor = getResources().getColor(R.color.pane_background);
this.bgColor = getResources().getColor(R.color.cpp_pane_background);
} else {
this.bgColor = getResources().getColor(android.R.color.transparent);
}

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

@@ -35,9 +35,9 @@ public class AngleUnitsButton extends DirectionDragButton {
final TextPaint directionTextPaint = directionTextData.getPaint();
if (CalculatorLocatorImpl.getInstance().getEngine().getAngleUnits().name().equals(directionTextData.getText())) {
directionTextPaint.setColor(resources.getColor(R.color.selected_angle_unit_text_color));
directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color));
} else {
directionTextPaint.setColor(resources.getColor(R.color.default_text_color));
directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color));
directionTextPaint.setAlpha(getDirectionTextAlpha());
}
}

4
calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
View File

@@ -35,9 +35,9 @@ public class NumeralBasesButton extends DirectionDragButton {
final TextPaint directionTextPaint = directionTextData.getPaint();
if (CalculatorLocatorImpl.getInstance().getEngine().getNumeralBase().name().equals(directionTextData.getText())) {
directionTextPaint.setColor(resources.getColor(R.color.selected_angle_unit_text_color));
directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color));
} else {
directionTextPaint.setColor(resources.getColor(R.color.default_text_color));
directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color));
directionTextPaint.setAlpha(getDirectionTextAlpha());
}
}

6
calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
View File

@@ -94,7 +94,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
@NotNull
private String getCursorColor(@NotNull Context context) {
if (cursorColor == null) {
cursorColor = Integer.toHexString(context.getResources().getColor(R.color.widget_cursor_color)).substring(2);
cursorColor = Integer.toHexString(context.getResources().getColor(R.color.cpp_widget_cursor_color)).substring(2);
}
return cursorColor;
}
@@ -205,9 +205,9 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
private void updateDisplayState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorDisplayViewState displayState) {
if (displayState.isValid()) {
views.setTextViewText(R.id.calculatorDisplay, displayState.getText());
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.default_text_color));
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_default_text_color));
} else {
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.display_error_text_color));
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_display_error_text_color));
}
}