From cb52a6f4f608145433d98a017fbfc48298a65702 Mon Sep 17 00:00:00 2001 From: cketti Date: Tue, 14 Feb 2017 10:34:05 +0100 Subject: [PATCH] Rename message list widget classes --- k9mail/src/main/AndroidManifest.xml | 8 ++++---- k9mail/src/main/java/com/fsck/k9/K9.java | 4 ++-- ...ctory.java => MessageListRemoteViewFactory.java} | 8 ++++---- ...Provider.java => MessageListWidgetProvider.java} | 10 +++++----- ...etService.java => MessageListWidgetService.java} | 4 ++-- ...get_icon.png => message_list_widget_preview.png} | Bin ...get_icon.png => message_list_widget_preview.png} | Bin ...get_icon.png => message_list_widget_preview.png} | Bin ...et_layout.xml => message_list_widget_layout.xml} | 0 ...t_item.xml => message_list_widget_list_item.xml} | 0 ...ing_view.xml => message_list_widget_loading.xml} | 0 ...layout_info.xml => message_list_widget_info.xml} | 6 +++--- 12 files changed, 20 insertions(+), 20 deletions(-) rename k9mail/src/main/java/com/fsck/k9/widget/list/{MailListRemoteViewFactory.java => MessageListRemoteViewFactory.java} (96%) rename k9mail/src/main/java/com/fsck/k9/widget/list/{MailListViewWidgetProvider.java => MessageListWidgetProvider.java} (89%) rename k9mail/src/main/java/com/fsck/k9/widget/list/{MailListViewWidgetService.java => MessageListWidgetService.java} (57%) rename k9mail/src/main/res/drawable-hdpi/{mail_list_widget_icon.png => message_list_widget_preview.png} (100%) rename k9mail/src/main/res/drawable-mdpi/{mail_list_widget_icon.png => message_list_widget_preview.png} (100%) rename k9mail/src/main/res/drawable-xhdpi/{mail_list_widget_icon.png => message_list_widget_preview.png} (100%) rename k9mail/src/main/res/layout/{mail_list_view_widget_layout.xml => message_list_widget_layout.xml} (100%) rename k9mail/src/main/res/layout/{mail_list_item.xml => message_list_widget_list_item.xml} (100%) rename k9mail/src/main/res/layout/{mail_list_loading_view.xml => message_list_widget_loading.xml} (100%) rename k9mail/src/main/res/xml/{mail_list_view_widget_layout_info.xml => message_list_widget_info.xml} (67%) diff --git a/k9mail/src/main/AndroidManifest.xml b/k9mail/src/main/AndroidManifest.xml index 8137ad8a6..3493e11b0 100644 --- a/k9mail/src/main/AndroidManifest.xml +++ b/k9mail/src/main/AndroidManifest.xml @@ -357,19 +357,19 @@ + android:resource="@xml/message_list_widget_info" /> diff --git a/k9mail/src/main/java/com/fsck/k9/K9.java b/k9mail/src/main/java/com/fsck/k9/K9.java index 28f7962d7..6c5f97276 100644 --- a/k9mail/src/main/java/com/fsck/k9/K9.java +++ b/k9mail/src/main/java/com/fsck/k9/K9.java @@ -44,7 +44,7 @@ import com.fsck.k9.service.BootReceiver; import com.fsck.k9.service.MailService; import com.fsck.k9.service.ShutdownReceiver; import com.fsck.k9.service.StorageGoneReceiver; -import com.fsck.k9.widget.list.MailListViewWidgetProvider; +import com.fsck.k9.widget.list.MessageListWidgetProvider; public class K9 extends Application { /** @@ -587,7 +587,7 @@ public class K9 extends Application { private void updateMailListWidget() { try { - MailListViewWidgetProvider.updateMailViewList(K9.this); + MessageListWidgetProvider.updateMailViewList(K9.this); } catch (Exception e) { if (BuildConfig.DEBUG) { throw e; diff --git a/k9mail/src/main/java/com/fsck/k9/widget/list/MailListRemoteViewFactory.java b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java similarity index 96% rename from k9mail/src/main/java/com/fsck/k9/widget/list/MailListRemoteViewFactory.java rename to k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java index b3941877e..ccf9d3827 100644 --- a/k9mail/src/main/java/com/fsck/k9/widget/list/MailListRemoteViewFactory.java +++ b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java @@ -23,7 +23,7 @@ import com.fsck.k9.R; import com.fsck.k9.provider.MessageProvider; -public class MailListRemoteViewFactory implements RemoteViewsService.RemoteViewsFactory { +public class MessageListRemoteViewFactory implements RemoteViewsService.RemoteViewsFactory { private static String[] MAIL_LIST_PROJECTIONS = { MessageProvider.MessageColumns.SENDER, MessageProvider.MessageColumns.SEND_DATE, @@ -43,7 +43,7 @@ public class MailListRemoteViewFactory implements RemoteViewsService.RemoteViews private int unreadTextColor; - public MailListRemoteViewFactory(Context context) { + public MessageListRemoteViewFactory(Context context) { this.context = context; calendar = Calendar.getInstance(); } @@ -103,7 +103,7 @@ public class MailListRemoteViewFactory implements RemoteViewsService.RemoteViews @Override public RemoteViews getViewAt(int position) { - RemoteViews remoteView = new RemoteViews(context.getPackageName(), R.layout.mail_list_item); + RemoteViews remoteView = new RemoteViews(context.getPackageName(), R.layout.message_list_widget_list_item); MailItem item = mailItems.get(position); CharSequence sender = item.unread ? bold(item.sender) : item.sender; @@ -139,7 +139,7 @@ public class MailListRemoteViewFactory implements RemoteViewsService.RemoteViews @Override public RemoteViews getLoadingView() { - RemoteViews loadingView = new RemoteViews(context.getPackageName(), R.layout.mail_list_loading_view); + RemoteViews loadingView = new RemoteViews(context.getPackageName(), R.layout.message_list_widget_loading); loadingView.setTextViewText(R.id.loadingText, context.getString(R.string.mail_list_widget_loading)); loadingView.setViewVisibility(R.id.loadingText, View.VISIBLE); return loadingView; diff --git a/k9mail/src/main/java/com/fsck/k9/widget/list/MailListViewWidgetProvider.java b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java similarity index 89% rename from k9mail/src/main/java/com/fsck/k9/widget/list/MailListViewWidgetProvider.java rename to k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java index 68909dd78..9a713cbe4 100644 --- a/k9mail/src/main/java/com/fsck/k9/widget/list/MailListViewWidgetProvider.java +++ b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java @@ -15,17 +15,17 @@ import com.fsck.k9.activity.MessageCompose; import com.fsck.k9.activity.MessageList; -public class MailListViewWidgetProvider extends AppWidgetProvider { +public class MessageListWidgetProvider extends AppWidgetProvider { private static String ACTION_UPDATE_MESSAGE_LIST = "UPDATE_MESSAGE_LIST"; public static void updateMailViewList(Context context) { Context appContext = context.getApplicationContext(); AppWidgetManager widgetManager = AppWidgetManager.getInstance(appContext); - ComponentName widget = new ComponentName(appContext, MailListViewWidgetProvider.class); + ComponentName widget = new ComponentName(appContext, MessageListWidgetProvider.class); int[] widgetIds = widgetManager.getAppWidgetIds(widget); - Intent intent = new Intent(context, MailListViewWidgetProvider.class); + Intent intent = new Intent(context, MessageListWidgetProvider.class); intent.setAction(ACTION_UPDATE_MESSAGE_LIST); intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIds); context.sendBroadcast(intent); @@ -39,11 +39,11 @@ public class MailListViewWidgetProvider extends AppWidgetProvider { } private void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) { - RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.mail_list_view_widget_layout); + RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.message_list_widget_layout); views.setTextViewText(R.id.folder, context.getString(R.string.integrated_inbox_title)); - Intent intent = new Intent(context, MailListViewWidgetService.class); + Intent intent = new Intent(context, MessageListWidgetService.class); intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))); views.setRemoteAdapter(R.id.listView, intent); diff --git a/k9mail/src/main/java/com/fsck/k9/widget/list/MailListViewWidgetService.java b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java similarity index 57% rename from k9mail/src/main/java/com/fsck/k9/widget/list/MailListViewWidgetService.java rename to k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java index b34504dec..019336fe8 100644 --- a/k9mail/src/main/java/com/fsck/k9/widget/list/MailListViewWidgetService.java +++ b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java @@ -5,9 +5,9 @@ import android.content.Intent; import android.widget.RemoteViewsService; -public class MailListViewWidgetService extends RemoteViewsService { +public class MessageListWidgetService extends RemoteViewsService { @Override public RemoteViewsFactory onGetViewFactory(Intent intent) { - return new MailListRemoteViewFactory(this.getApplicationContext()); + return new MessageListRemoteViewFactory(this.getApplicationContext()); } } diff --git a/k9mail/src/main/res/drawable-hdpi/mail_list_widget_icon.png b/k9mail/src/main/res/drawable-hdpi/message_list_widget_preview.png similarity index 100% rename from k9mail/src/main/res/drawable-hdpi/mail_list_widget_icon.png rename to k9mail/src/main/res/drawable-hdpi/message_list_widget_preview.png diff --git a/k9mail/src/main/res/drawable-mdpi/mail_list_widget_icon.png b/k9mail/src/main/res/drawable-mdpi/message_list_widget_preview.png similarity index 100% rename from k9mail/src/main/res/drawable-mdpi/mail_list_widget_icon.png rename to k9mail/src/main/res/drawable-mdpi/message_list_widget_preview.png diff --git a/k9mail/src/main/res/drawable-xhdpi/mail_list_widget_icon.png b/k9mail/src/main/res/drawable-xhdpi/message_list_widget_preview.png similarity index 100% rename from k9mail/src/main/res/drawable-xhdpi/mail_list_widget_icon.png rename to k9mail/src/main/res/drawable-xhdpi/message_list_widget_preview.png diff --git a/k9mail/src/main/res/layout/mail_list_view_widget_layout.xml b/k9mail/src/main/res/layout/message_list_widget_layout.xml similarity index 100% rename from k9mail/src/main/res/layout/mail_list_view_widget_layout.xml rename to k9mail/src/main/res/layout/message_list_widget_layout.xml diff --git a/k9mail/src/main/res/layout/mail_list_item.xml b/k9mail/src/main/res/layout/message_list_widget_list_item.xml similarity index 100% rename from k9mail/src/main/res/layout/mail_list_item.xml rename to k9mail/src/main/res/layout/message_list_widget_list_item.xml diff --git a/k9mail/src/main/res/layout/mail_list_loading_view.xml b/k9mail/src/main/res/layout/message_list_widget_loading.xml similarity index 100% rename from k9mail/src/main/res/layout/mail_list_loading_view.xml rename to k9mail/src/main/res/layout/message_list_widget_loading.xml diff --git a/k9mail/src/main/res/xml/mail_list_view_widget_layout_info.xml b/k9mail/src/main/res/xml/message_list_widget_info.xml similarity index 67% rename from k9mail/src/main/res/xml/mail_list_view_widget_layout_info.xml rename to k9mail/src/main/res/xml/message_list_widget_info.xml index 22ec55cd2..e4fff6ea1 100644 --- a/k9mail/src/main/res/xml/mail_list_view_widget_layout_info.xml +++ b/k9mail/src/main/res/xml/message_list_widget_info.xml @@ -1,12 +1,12 @@