Merge pull request #208 from l3d00m/widget_sizes

Allow smaller widget sizes for #194
This commit is contained in:
Moez Bhatti
2015-10-18 20:16:20 -04:00
3 changed files with 50 additions and 10 deletions
@@ -16,6 +16,7 @@
package com.moez.QKSMS.ui.widget; package com.moez.QKSMS.ui.widget;
import android.annotation.TargetApi;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProvider; import android.appwidget.AppWidgetProvider;
@@ -23,8 +24,10 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.widget.RemoteViews; import android.widget.RemoteViews;
import com.moez.QKSMS.R; import com.moez.QKSMS.R;
import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.MainActivity;
import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.ThemeManager;
@@ -45,7 +48,7 @@ public class WidgetProvider extends AppWidgetProvider {
ThemeManager.loadThemeProperties(context); ThemeManager.loadThemeProperties(context);
for (int appWidgetId : appWidgetIds) { 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 * 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); Log.v(TAG, "updateWidget appWidgetId: " + appWidgetId);
RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget); RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget);
PendingIntent clickIntent; PendingIntent clickIntent;
@@ -80,8 +113,9 @@ public class WidgetProvider extends AppWidgetProvider {
// Launch an intent to avoid ANRs // Launch an intent to avoid ANRs
final Intent intent = new Intent(context, WidgetService.class); final Intent intent = new Intent(context, WidgetService.class);
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
intent.putExtra("small_widget", smallWidget);
intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))); 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.setTextViewText(R.id.widget_label, context.getString(R.string.title_conversation_list));
remoteViews.setTextColor(R.id.widget_label, ThemeManager.getTextOnColorPrimary()); 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)); int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, WidgetProvider.class));
for (int appWidgetId : appWidgetIds) { for (int appWidgetId : appWidgetIds) {
updateWidget(context, appWidgetId); updateWidget(context, appWidgetId, isSmallWidget(appWidgetManager, appWidgetId));
} }
} }
@@ -32,12 +32,13 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.RemoteViews; import android.widget.RemoteViews;
import android.widget.RemoteViewsService; import android.widget.RemoteViewsService;
import com.moez.QKSMS.R; 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.ConversationPrefsHelper;
import com.moez.QKSMS.common.utils.ImageUtils; import com.moez.QKSMS.common.utils.ImageUtils;
import com.moez.QKSMS.common.utils.MessageUtils; 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.MainActivity;
import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.ThemeManager;
@@ -62,6 +63,7 @@ public class WidgetService extends RemoteViewsService {
private static final int MAX_CONVERSATIONS_COUNT = 25; private static final int MAX_CONVERSATIONS_COUNT = 25;
private final Context mContext; private final Context mContext;
private final int mAppWidgetId; private final int mAppWidgetId;
private final int mSmallWidget;
private boolean mShouldShowViewMore; private boolean mShouldShowViewMore;
private Cursor mConversationCursor; private Cursor mConversationCursor;
private int mUnreadConvCount; private int mUnreadConvCount;
@@ -70,6 +72,7 @@ public class WidgetService extends RemoteViewsService {
public WidgetFactory(Context context, Intent intent) { public WidgetFactory(Context context, Intent intent) {
mContext = context; mContext = context;
mAppWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); mAppWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
mSmallWidget = intent.getIntExtra("small_widget", 0);
mAppWidgetManager = AppWidgetManager.getInstance(context); mAppWidgetManager = AppWidgetManager.getInstance(context);
Log.v(TAG, "WidgetFactory intent: " + intent + "widget id: " + mAppWidgetId); Log.v(TAG, "WidgetFactory intent: " + intent + "widget id: " + mAppWidgetId);
} }
@@ -190,8 +193,11 @@ public class WidgetService extends RemoteViewsService {
Conversation conversation = Conversation.from(mContext, mConversationCursor); Conversation conversation = Conversation.from(mContext, mConversationCursor);
RemoteViews remoteViews = new RemoteViews(mContext.getPackageName(), R.layout.list_item_conversation_widget); RemoteViews remoteViews = new RemoteViews(mContext.getPackageName(), R.layout.list_item_conversation_widget);
if (mSmallWidget == 0) {
bindAvatar(remoteViews, conversation); remoteViews.setViewVisibility(R.id.avatar, View.VISIBLE);
bindAvatar(remoteViews, conversation);
}
else remoteViews.setViewVisibility(R.id.avatar, View.GONE);
bindIndicators(remoteViews, conversation); bindIndicators(remoteViews, conversation);
bindDate(remoteViews, conversation); bindDate(remoteViews, conversation);
bindName(remoteViews, conversation); bindName(remoteViews, conversation);
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:initialLayout="@layout/widget" android:initialLayout="@layout/widget"
android:minHeight="220dp" android:minHeight="110dp"
android:minWidth="220dp" android:minWidth="180dp"
android:previewImage="@mipmap/ic_launcher_teal" android:previewImage="@mipmap/ic_launcher_teal"
android:resizeMode="horizontal|vertical" android:resizeMode="horizontal|vertical"
android:updatePeriodMillis="0" android:updatePeriodMillis="0"