From 56c9f4c9a0cffa57c5f4d15b1da675f9bf327c4c Mon Sep 17 00:00:00 2001 From: l3d00m Date: Wed, 16 Sep 2015 17:33:59 +0200 Subject: [PATCH] Fix for #194 Allow widget to be resized to 2x3. If width is under 4 columns, hide contact avatars. --- .../moez/QKSMS/ui/widget/WidgetProvider.java | 42 +++++++++++++++++-- .../moez/QKSMS/ui/widget/WidgetService.java | 14 +++++-- QKSMS/src/main/res/xml/widget_info.xml | 4 +- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetProvider.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetProvider.java index e024345c..85b96b18 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetProvider.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetProvider.java @@ -16,6 +16,7 @@ package com.moez.QKSMS.ui.widget; +import android.annotation.TargetApi; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; @@ -23,8 +24,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.os.Bundle; import android.util.Log; import android.widget.RemoteViews; + import com.moez.QKSMS.R; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; @@ -45,7 +48,7 @@ public class WidgetProvider extends AppWidgetProvider { ThemeManager.loadThemeProperties(context); for (int appWidgetId : appWidgetIds) { - updateWidget(context, appWidgetId); + updateWidget(context, appWidgetId, isSmallWidget(appWidgetManager, appWidgetId)); } } @@ -69,10 +72,40 @@ public class WidgetProvider extends AppWidgetProvider { } } + /** + * Update widget when widget size changes + */ + @Override + public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, + int appWidgetId, Bundle newOptions) { + Log.v("TAG", "Changed widget dimensions"); + updateWidget(context, appWidgetId, isSmallWidget(appWidgetManager,appWidgetId)); + + super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions); + } + + /** + * Returns 1 when widget has less than 4 columns, else 0 + */ + @TargetApi(16) + private static int isSmallWidget(AppWidgetManager appWidgetManager, int appWidgetId) { + + Bundle options = appWidgetManager.getAppWidgetOptions(appWidgetId); + int size = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH); + int n = 2; + while (70 * n - 30 < size) { + ++n; + } + int columns = n - 1; + + if (columns < 4) return 1; + else return 0; + } + /** * Update the widget appWidgetId */ - private static void updateWidget(Context context, int appWidgetId) { + private static void updateWidget(Context context, int appWidgetId, int smallWidget) { Log.v(TAG, "updateWidget appWidgetId: " + appWidgetId); RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget); PendingIntent clickIntent; @@ -80,8 +113,9 @@ public class WidgetProvider extends AppWidgetProvider { // Launch an intent to avoid ANRs final Intent intent = new Intent(context, WidgetService.class); intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); + intent.putExtra("small_widget", smallWidget); intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))); - remoteViews.setRemoteAdapter(appWidgetId, R.id.conversation_list, intent); + remoteViews.setRemoteAdapter(R.id.conversation_list, intent); remoteViews.setTextViewText(R.id.widget_label, context.getString(R.string.title_conversation_list)); remoteViews.setTextColor(R.id.widget_label, ThemeManager.getTextOnColorPrimary()); @@ -125,7 +159,7 @@ public class WidgetProvider extends AppWidgetProvider { int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, WidgetProvider.class)); for (int appWidgetId : appWidgetIds) { - updateWidget(context, appWidgetId); + updateWidget(context, appWidgetId, isSmallWidget(appWidgetManager, appWidgetId)); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java index f61feba6..cbfdbe54 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java @@ -32,12 +32,13 @@ import android.util.Log; import android.view.View; import android.widget.RemoteViews; import android.widget.RemoteViewsService; + import com.moez.QKSMS.R; -import com.moez.QKSMS.data.ContactHelper; -import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.utils.ImageUtils; import com.moez.QKSMS.common.utils.MessageUtils; +import com.moez.QKSMS.data.ContactHelper; +import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; @@ -62,6 +63,7 @@ public class WidgetService extends RemoteViewsService { private static final int MAX_CONVERSATIONS_COUNT = 25; private final Context mContext; private final int mAppWidgetId; + private final int mSmallWidget; private boolean mShouldShowViewMore; private Cursor mConversationCursor; private int mUnreadConvCount; @@ -70,6 +72,7 @@ public class WidgetService extends RemoteViewsService { public WidgetFactory(Context context, Intent intent) { mContext = context; mAppWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); + mSmallWidget = intent.getIntExtra("small_widget", 0); mAppWidgetManager = AppWidgetManager.getInstance(context); Log.v(TAG, "WidgetFactory intent: " + intent + "widget id: " + mAppWidgetId); } @@ -190,8 +193,11 @@ public class WidgetService extends RemoteViewsService { Conversation conversation = Conversation.from(mContext, mConversationCursor); RemoteViews remoteViews = new RemoteViews(mContext.getPackageName(), R.layout.list_item_conversation_widget); - - bindAvatar(remoteViews, conversation); + if (mSmallWidget == 0) { + remoteViews.setViewVisibility(R.id.avatar, View.VISIBLE); + bindAvatar(remoteViews, conversation); + } + else remoteViews.setViewVisibility(R.id.avatar, View.GONE); bindIndicators(remoteViews, conversation); bindDate(remoteViews, conversation); bindName(remoteViews, conversation); diff --git a/QKSMS/src/main/res/xml/widget_info.xml b/QKSMS/src/main/res/xml/widget_info.xml index d8536d58..4121b658 100644 --- a/QKSMS/src/main/res/xml/widget_info.xml +++ b/QKSMS/src/main/res/xml/widget_info.xml @@ -1,8 +1,8 @@