From a76fe608b7e14176b0e21371cb9c46d56534faf7 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sat, 20 Oct 2012 17:18:46 +0400
Subject: [PATCH] Widget fixes

---
 calculatorpp/res/values-v14/dimens.xml        |  3 +
 calculatorpp/res/values/dimens.xml            |  1 +
 calculatorpp/res/values/theme_default.xml     |  1 +
 .../widget/CalculatorWidgetProvider.java      | 63 ++++++++++---------
 4 files changed, 40 insertions(+), 28 deletions(-)
 create mode 100644 calculatorpp/res/values-v14/dimens.xml

diff --git a/calculatorpp/res/values-v14/dimens.xml b/calculatorpp/res/values-v14/dimens.xml
new file mode 100644
index 00000000..5e10ef97
--- /dev/null
+++ b/calculatorpp/res/values-v14/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="widget_margin">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/dimens.xml b/calculatorpp/res/values/dimens.xml
index 7bb2d138..8f88c138 100644
--- a/calculatorpp/res/values/dimens.xml
+++ b/calculatorpp/res/values/dimens.xml
@@ -18,6 +18,7 @@
     <dimen name="widget_editor_text_size">25sp</dimen>
     <dimen name="widget_keyboard_button_text_size">20dp</dimen>
     <dimen name="widget_display_text_size">25sp</dimen>
+    <dimen name="widget_margin">6dp</dimen>
 
     <!--only for not multipane-->
     <dimen name="editor_padding">5dp</dimen>
diff --git a/calculatorpp/res/values/theme_default.xml b/calculatorpp/res/values/theme_default.xml
index 90eeb26e..08245afb 100644
--- a/calculatorpp/res/values/theme_default.xml
+++ b/calculatorpp/res/values/theme_default.xml
@@ -82,6 +82,7 @@
 
     <style name="widget_main_layout_style" parent="default_main_layout_style">
         <item name="android:padding">1dp</item>
+        <item name="android:layout_margin">@dimen/widget_margin</item>
     </style>
 
     <style name="default_actionbar_style" parent="@style/Widget.Sherlock.ActionBar">
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
index a0ebece4..65d3554f 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
@@ -70,7 +70,7 @@ public class CalculatorWidgetProvider extends AppWidgetProvider {
 
     @NotNull
     private String getCursorColor(@NotNull Context context) {
-        if ( cursorColor == null ) {
+        if (cursorColor == null) {
             cursorColor = Integer.toHexString(context.getResources().getColor(R.color.widget_cursor_color)).substring(2);
         }
         return cursorColor;
@@ -82,6 +82,22 @@ public class CalculatorWidgetProvider extends AppWidgetProvider {
                          @NotNull int[] appWidgetIds) {
         super.onUpdate(context, appWidgetManager, appWidgetIds);
 
+        updateWidget(context, appWidgetManager, appWidgetIds, CalculatorLocatorImpl.getInstance().getEditor().getViewState(), CalculatorLocatorImpl.getInstance().getDisplay().getViewState());
+    }
+
+    private void updateWidget(@NotNull Context context,
+                              @NotNull CalculatorEditorViewState editorState,
+                              @NotNull CalculatorDisplayViewState displayState) {
+        final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+        final int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, CalculatorWidgetProvider.class));
+        updateWidget(context, appWidgetManager, appWidgetIds, editorState, displayState);
+    }
+
+    private void updateWidget(@NotNull Context context,
+                              @NotNull AppWidgetManager appWidgetManager,
+                              @NotNull int[] appWidgetIds,
+                              @NotNull CalculatorEditorViewState editorState,
+                              @NotNull CalculatorDisplayViewState displayState) {
         for (int appWidgetId : appWidgetIds) {
             final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_layout);
 
@@ -95,6 +111,9 @@ public class CalculatorWidgetProvider extends AppWidgetProvider {
                 }
             }
 
+            updateEditorState(context, views, editorState);
+            updateDisplayState(context, views, displayState);
+
             appWidgetManager.updateAppWidget(appWidgetId, views);
         }
     }
@@ -115,60 +134,48 @@ public class CalculatorWidgetProvider extends AppWidgetProvider {
 
             final Serializable object = intent.getSerializableExtra(EDITOR_STATE_EXTRA);
             if (object instanceof CalculatorEditorViewState) {
-                updateEditorState(context, (CalculatorEditorViewState) object);
+                updateWidget(context, (CalculatorEditorViewState) object, CalculatorLocatorImpl.getInstance().getDisplay().getViewState());
             }
         } else if (DISPLAY_STATE_CHANGED_ACTION.equals(intent.getAction())) {
             CalculatorLocatorImpl.getInstance().getNotifier().showDebugMessage(TAG, "Display state changed broadcast received!");
 
             final Serializable object = intent.getSerializableExtra(DISPLAY_STATE_EXTRA);
             if (object instanceof CalculatorDisplayViewState) {
-                updateDisplayState(context, (CalculatorDisplayViewState) object);
+                updateWidget(context, CalculatorLocatorImpl.getInstance().getEditor().getViewState(), (CalculatorDisplayViewState) object);
             }
+        } else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(intent.getAction())) {
+            updateWidget(context, CalculatorLocatorImpl.getInstance().getEditor().getViewState(), CalculatorLocatorImpl.getInstance().getDisplay().getViewState());
         }
     }
 
-    private void updateDisplayState(@NotNull Context context, @NotNull CalculatorDisplayViewState displayState) {
+    private void updateDisplayState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorDisplayViewState displayState) {
         if (displayState.isValid()) {
-            setText(context, R.id.calculatorDisplay, displayState.getText());
-            setTextColor(context, R.id.calculatorDisplay, context.getResources().getColor(R.color.default_text_color));
+            setText(views, R.id.calculatorDisplay, displayState.getText());
+            setTextColor(views, R.id.calculatorDisplay, context.getResources().getColor(R.color.default_text_color));
         } else {
-            setTextColor(context, R.id.calculatorDisplay, context.getResources().getColor(R.color.display_error_text_color));
+            setTextColor(views, R.id.calculatorDisplay, context.getResources().getColor(R.color.display_error_text_color));
         }
     }
 
-    private void setText(@NotNull Context context, int textViewId, @Nullable CharSequence text) {
-        final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-
-        final int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, CalculatorWidgetProvider.class));
-        for (int appWidgetId : appWidgetIds) {
-            final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_layout);
-            views.setTextViewText(textViewId, text);
-            appWidgetManager.updateAppWidget(appWidgetId, views);
-        }
+    private void setText(@NotNull RemoteViews views, int textViewId, @Nullable CharSequence text) {
+        views.setTextViewText(textViewId, text);
     }
 
-    private void setTextColor(@NotNull Context context, int textViewId, int textColor) {
-        final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-
-        final int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, CalculatorWidgetProvider.class));
-        for (int appWidgetId : appWidgetIds) {
-            final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_layout);
-            views.setTextColor(textViewId, textColor);
-            appWidgetManager.updateAppWidget(appWidgetId, views);
-        }
+    private void setTextColor(@NotNull RemoteViews views, int textViewId, int textColor) {
+        views.setTextColor(textViewId, textColor);
     }
 
-    private void updateEditorState(@NotNull Context context, @NotNull CalculatorEditorViewState editorState) {
+    private void updateEditorState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorEditorViewState editorState) {
         String text = editorState.getText();
 
         CharSequence newText = text;
         int selection = editorState.getSelection();
-        if (selection >= 0 && selection <= text.length() ) {
+        if (selection >= 0 && selection <= text.length()) {
             // inject cursor
             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(context, R.id.calculatorEditor, newText);
+        setText(views, R.id.calculatorEditor, newText);
     }
 
     /*