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

Merge remote-tracking branch 'origin/dev-widget' into dev-widget

Browse Source 
Conflicts:
	calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
	calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
This commit is contained in:
Sergey Solovyev
2012-10-26 21:37:48 +04:00
parent fa0357a0b4 8cda4424a3
commit 1a284cbf13
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
View File

@@ -181,21 +181,13 @@ public class CalculatorWidgetProvider extends AppWidgetProvider {
private void updateDisplayState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorDisplayViewState displayState) {
if (displayState.isValid()) {
setText(views, R.id.calculatorDisplay, displayState.getText());
setTextColor(views, R.id.calculatorDisplay, context.getResources().getColor(R.color.default_text_color));
views.setTextViewText(R.id.calculatorDisplay, displayState.getText());
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.default_text_color));
} else {
setTextColor(views, R.id.calculatorDisplay, context.getResources().getColor(R.color.display_error_text_color));
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.display_error_text_color));
}
}
private void setText(@NotNull RemoteViews views, int textViewId, @Nullable CharSequence text) {
views.setTextViewText(textViewId, text);
}
private void setTextColor(@NotNull RemoteViews views, int textViewId, int textColor) {
views.setTextColor(textViewId, textColor);
}
private void updateEditorState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorEditorViewState editorState) {
String text = editorState.getText();
@@ -206,7 +198,7 @@ public class CalculatorWidgetProvider extends AppWidgetProvider {
newText = Html.fromHtml(text.substring(0, selection) + "<font color=\"#" + getCursorColor(context) + "\">|</font>" + text.substring(selection));
}
CalculatorLocatorImpl.getInstance().getNotifier().showDebugMessage(TAG, "New editor state: " + text);
setText(views, R.id.calculatorEditor, newText);
views.setTextViewText(R.id.calculatorEditor, newText);
}
/*