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

Themes & styles

Browse Source
This commit is contained in:
serso
2015-01-28 09:54:23 +01:00
parent 467a753f21
commit ac07d546c1
19 changed files with 120 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,7 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
AndroidCalculatorDisplayView.this.state = state;
if (state.isValid()) {
setTextColor(getResources().getColor(R.color.cpp_default_text_color));
setTextColor(getResources().getColor(R.color.cpp_text));
setText(text);
adjustTextSize();
@@ -136,7 +136,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.cpp_display_error_text_color));
setTextColor(getResources().getColor(R.color.cpp_text_error));
// error messages are never shown -> just greyed out text (error message will be shown on click)
//setText(state.getErrorMessage());

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

@@ -67,9 +67,9 @@ public class AngleUnitsButton extends DirectionDragButton {
final int color;
final Resources resources = getResources();
if (isCurrentAngleUnits(directionText)) {
color = resources.getColor(R.color.cpp_selected_angle_unit_text_color);
color = resources.getColor(R.color.cpp_selected_angle_unit_text);
} else {
color = resources.getColor(R.color.cpp_default_text_color);
color = resources.getColor(R.color.cpp_text);
}
return color;
}

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

@@ -65,9 +65,9 @@ public class NumeralBasesButton extends DirectionDragButton {
int getDirectionTextColor(@Nonnull String directionText) {
final int color;
if (isCurrentNumberBase(directionText)) {
color = getResources().getColor(R.color.cpp_selected_angle_unit_text_color);
color = getResources().getColor(R.color.cpp_selected_angle_unit_text);
} else {
color = getResources().getColor(R.color.cpp_default_text_color);
color = getResources().getColor(R.color.cpp_text);
}
return color;
}

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

@@ -95,7 +95,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
@Nonnull
private String getCursorColor(@Nonnull Context context) {
if (cursorColor == null) {
cursorColor = Integer.toHexString(context.getResources().getColor(R.color.cpp_widget_cursor_color)).substring(2);
cursorColor = Integer.toHexString(context.getResources().getColor(R.color.cpp_widget_cursor)).substring(2);
}
return cursorColor;
}
@@ -198,9 +198,9 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
private void updateDisplayState(@Nonnull Context context, @Nonnull RemoteViews views, @Nonnull CalculatorDisplayViewState displayState) {
if (displayState.isValid()) {
views.setTextViewText(R.id.calculator_display, displayState.getText());
views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_default_text_color));
views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_text));
} else {
views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_display_error_text_color));
views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_text_error));
}
}