From 4bfb8393700678e044df2783a4b9dc7f1b1675b9 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sat, 16 Apr 2016 08:51:20 -0400
Subject: [PATCH] Draw separate widgets for landscape and portrait modes

Fixes #76
---
 .../uhabits/widgets/BaseWidgetProvider.java   | 74 ++++++++++++-------
 1 file changed, 49 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
index 558a5da41..e85f4190f 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
@@ -45,7 +45,8 @@ import java.io.IOException;
 public abstract class BaseWidgetProvider extends AppWidgetProvider
 {
 
-    private int width, height;
+    private int portraitWidth, portraitHeight;
+    private int landscapeWidth, landscapeHeight;
 
     protected abstract int getDefaultHeight();
 
@@ -132,7 +133,7 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
             ImageView iv = (ImageView) view.findViewById(R.id.imageView);
             iv.setImageBitmap(widgetCache);
 
-            view.measure(width, height);
+            view.measure(portraitWidth, portraitHeight);
             view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
             view.setDrawingCacheEnabled(true);
             view.buildDrawingCache();
@@ -172,8 +173,11 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
                     options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT));
         }
 
-        width = maxWidth;
-        height = maxHeight;
+        portraitWidth = minWidth;
+        portraitHeight = maxHeight;
+
+        landscapeWidth = maxWidth;
+        landscapeHeight = minHeight;
     }
 
     private void measureCustomView(Context context, int w, int h, View customView)
@@ -203,8 +207,8 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
         private final Context context;
         private final Habit habit;
         private final AppWidgetManager manager;
-        public RemoteViews remoteViews;
-        public View widgetView;
+        public RemoteViews portraitRemoteViews, landscapeRemoteViews;
+        public View portraitWidgetView, landscapeWidgetView;
 
         public RenderWidgetTask(int widgetId, Context context, Habit habit,
                                 AppWidgetManager manager)
@@ -220,16 +224,31 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
         {
             super.onPreExecute();
 
-            remoteViews = new RemoteViews(context.getPackageName(), getLayoutId());
-            widgetView = buildCustomView(context, habit);
-            measureCustomView(context, width, height, widgetView);
-            manager.updateAppWidget(widgetId, remoteViews);
+            portraitRemoteViews = new RemoteViews(context.getPackageName(), getLayoutId());
+            portraitWidgetView = buildCustomView(context, habit);
+            measureCustomView(context, portraitWidth, portraitHeight, portraitWidgetView);
+
+            landscapeRemoteViews = new RemoteViews(context.getPackageName(), getLayoutId());
+            landscapeWidgetView = buildCustomView(context, habit);
+            measureCustomView(context, landscapeWidth, landscapeHeight, landscapeWidgetView);
+
+            updateAppWidget();
+        }
+
+        private void updateAppWidget()
+        {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
+                manager.updateAppWidget(widgetId, new RemoteViews(landscapeRemoteViews,
+                        portraitRemoteViews));
+            else
+                manager.updateAppWidget(widgetId, portraitRemoteViews);
         }
 
         @Override
         protected void doInBackground()
         {
-            refreshCustomViewData(widgetView);
+            refreshCustomViewData(portraitWidgetView);
+            refreshCustomViewData(landscapeWidgetView);
         }
 
         @Override
@@ -237,20 +256,9 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
         {
             try
             {
-                widgetView.invalidate();
-                widgetView.setDrawingCacheEnabled(true);
-                widgetView.buildDrawingCache(true);
-                Bitmap drawingCache = widgetView.getDrawingCache();
-                remoteViews.setTextViewText(R.id.label, habit.name);
-                remoteViews.setImageViewBitmap(R.id.imageView, drawingCache);
-
-                //savePreview(context, widgetId, drawingCache);
-
-                PendingIntent onClickIntent = getOnClickPendingIntent(context, habit);
-                if (onClickIntent != null) remoteViews.setOnClickPendingIntent(R.id.imageView,
-                        onClickIntent);
-
-                manager.updateAppWidget(widgetId, remoteViews);
+                buildRemoteViews(portraitWidgetView, portraitRemoteViews);
+                buildRemoteViews(landscapeWidgetView, landscapeRemoteViews);
+                updateAppWidget();
             }
             catch (Exception e)
             {
@@ -260,5 +268,21 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
 
             super.onPostExecute(aVoid);
         }
+
+        private void buildRemoteViews(View widgetView, RemoteViews remoteViews)
+        {
+            widgetView.invalidate();
+            widgetView.setDrawingCacheEnabled(true);
+            widgetView.buildDrawingCache(true);
+            Bitmap drawingCache = widgetView.getDrawingCache();
+            remoteViews.setTextViewText(R.id.label, habit.name);
+            remoteViews.setImageViewBitmap(R.id.imageView, drawingCache);
+
+            //savePreview(context, widgetId, drawingCache);
+
+            PendingIntent onClickIntent = getOnClickPendingIntent(context, habit);
+            if (onClickIntent != null) remoteViews.setOnClickPendingIntent(R.id.imageView,
+                    onClickIntent);
+        }
     }
 }