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 17:33:05 +04:00
parent 5ae964a8b2
commit fa7904c1cd
71 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ public class AndroidCalculator implements Calculator, CalculatorEventListener, S
}
public void setDisplay(@NotNull Activity activity) {
final AndroidCalculatorDisplayView displayView = (AndroidCalculatorDisplayView) activity.findViewById(R.id.calculatorDisplay);
final AndroidCalculatorDisplayView displayView = (AndroidCalculatorDisplayView) activity.findViewById(R.id.calculator_display);
setDisplay(activity, displayView);
}
@@ -69,7 +69,7 @@ public class AndroidCalculator implements Calculator, CalculatorEventListener, S
}
public void setEditor(@NotNull Activity activity) {
final AndroidCalculatorEditorView editorView = (AndroidCalculatorEditorView) activity.findViewById(R.id.calculatorEditor);
final AndroidCalculatorEditorView editorView = (AndroidCalculatorEditorView) activity.findViewById(R.id.calculator_editor);
setEditor(activity, editorView);
}

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

@@ -47,7 +47,7 @@ public class CalculatorFragmentHelperImpl extends AbstractCalculatorHelper imple
}
public void setPaneTitle(@NotNull Fragment fragment, int titleResId) {
final TextView fragmentTitle = (TextView) fragment.getView().findViewById(R.id.fragmentTitle);
final TextView fragmentTitle = (TextView) fragment.getView().findViewById(R.id.fragment_title);
if (fragmentTitle != null) {
if (!isPane(fragment)) {
fragmentTitle.setVisibility(View.GONE);

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

@@ -204,10 +204,10 @@ 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.cpp_default_text_color));
views.setTextViewText(R.id.calculator_display, displayState.getText());
views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_default_text_color));
} else {
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_display_error_text_color));
views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_display_error_text_color));
}
}
@@ -221,7 +221,7 @@ abstract class AbstractCalculatorWidgetProvider 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);
views.setTextViewText(R.id.calculatorEditor, newText);
views.setTextViewText(R.id.calculator_editor, newText);
}
/*