diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java index 5c8c872c..dba2fbc3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java @@ -1,94 +1,59 @@ package com.moez.QKSMS.common; import android.util.Log; -import android.view.View; import com.moez.QKSMS.R; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.transaction.SmsHelper; import com.moez.QKSMS.ui.MainActivity; -import com.moez.QKSMS.ui.conversationlist.ConversationListAdapter; import com.moez.QKSMS.ui.dialog.DefaultSmsHelper; import com.moez.QKSMS.ui.dialog.QKDialog; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; +import java.util.HashSet; +import java.util.Set; public class DialogHelper { private static final String TAG = "DialogHelper"; public static void showDeleteConversationDialog(MainActivity context, long threadId) { - List threadIds = new ArrayList<>(); + Set threadIds = new HashSet<>(); threadIds.add(threadId); - showDeleteConversationDialog(context, threadIds); + showDeleteConversationsDialog(context, threadIds); } - public static void showDeleteFailedMessagesDialog(final MainActivity context, final long threadId) { + public static void showDeleteConversationsDialog(final MainActivity context, final Set threadIds) { + + new DefaultSmsHelper(context, R.string.not_default_delete).showIfNotDefault(null); + + new QKDialog() + .setContext(context) + .setTitle(R.string.delete_conversation) + .setMessage(R.string.delete_confirmation) + .setPositiveButton(R.string.yes, v -> { + Log.d(TAG, "Deleting threads: " + Arrays.toString(threadIds.toArray())); + Conversation.ConversationQueryHandler handler = new Conversation.ConversationQueryHandler(context.getContentResolver()); + + Conversation.startDelete(handler, 0, false, threadIds); + Conversation.asyncDeleteObsoleteThreads(handler, 0); + context.showMenu(); + }).setNegativeButton(R.string.cancel, null) + .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); + + } + + public static void showDeleteFailedMessagesDialog(final MainActivity context, final Set threadIds) { new DefaultSmsHelper(context, R.string.not_default_delete).showIfNotDefault(null); new QKDialog() .setContext(context) .setTitle(R.string.delete_all_failed) .setMessage(R.string.delete_all_failed_confirmation) - .setPositiveButton(R.string.yes, new View.OnClickListener() { - - @Override - public void onClick(View v) { - new Thread(new Runnable() { - public void run() { - SmsHelper.deleteFailedMessages(context, threadId); - } - }).start(); - } - }).setNegativeButton(R.string.cancel, null) - .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); - } - - public static void showDeleteConversationDialog(final MainActivity context, final List threadIds) { - - new DefaultSmsHelper(context, R.string.not_default_delete).showIfNotDefault(null); - - new QKDialog() - .setContext(context) - .setTitle(R.string.delete_conversation) - .setMessage(R.string.delete_confirmation) - .setPositiveButton(R.string.yes, new View.OnClickListener() { - - @Override - public void onClick(View v) { - Log.d(TAG, "Deleting threads: " + Arrays.toString(threadIds.toArray())); - Conversation.ConversationQueryHandler handler = new Conversation.ConversationQueryHandler(context.getContentResolver()); - - Conversation.startDelete(handler, 0, false, threadIds); - Conversation.asyncDeleteObsoleteThreads(handler, 0); - context.showMenu(); - } - }).setNegativeButton(R.string.cancel, null) - .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); - - } - - public static void showDeleteConversationsDialog(MainActivity context, final ConversationListAdapter adapter) { - - new DefaultSmsHelper(context, R.string.not_default_delete).showIfNotDefault(null); - - - final Conversation.ConversationQueryHandler handler = new Conversation.ConversationQueryHandler(context.getContentResolver()); - final ArrayList threadIds = adapter.getSelectedItems(); - - new QKDialog() - .setContext(context) - .setTitle(R.string.delete_conversation) - .setMessage(R.string.delete_confirmation) - .setPositiveButton(R.string.yes, new View.OnClickListener() { - - @Override - public void onClick(View v) { - Log.d(TAG, "Deleting threads: " + Arrays.toString(threadIds.toArray())); - Conversation.startDelete(handler, 0, false, threadIds); - Conversation.asyncDeleteObsoleteThreads(handler, 0); - adapter.disableMultiSelectMode(true); - } + .setPositiveButton(R.string.yes, v -> { + new Thread(() -> { + for (long threadId : threadIds) { + SmsHelper.deleteFailedMessages(context, threadId); + } + }).start(); }).setNegativeButton(R.string.cancel, null) .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/RecyclerCursorAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/RecyclerCursorAdapter.java index fbe3eabc..5e5828e9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/RecyclerCursorAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/RecyclerCursorAdapter.java @@ -3,10 +3,9 @@ package com.moez.QKSMS.ui.base; import android.database.Cursor; import android.support.v7.widget.RecyclerView; import android.view.View; - import com.moez.QKSMS.common.utils.CursorUtils; -import java.util.ArrayList; +import java.util.HashMap; public abstract class RecyclerCursorAdapter extends RecyclerView.Adapter { @@ -32,7 +31,7 @@ public abstract class RecyclerCursorAdapter mSelectedItems = new ArrayList<>(); + protected HashMap mSelectedItems = new HashMap<>(); protected ItemClickListener mItemClickListener; protected RecyclerCursorAdapter.MultiSelectListener mMultiSelectListener; @@ -79,7 +78,7 @@ public abstract class RecyclerCursorAdapter 0; } - public ArrayList getSelectedItems() { + public HashMap getSelectedItems() { return mSelectedItems; } @@ -95,12 +94,12 @@ public abstract class RecyclerCursorAdapter, LiveView, RecyclerCursorAdapter.ItemClickListener, RecyclerCursorAdapter.MultiSelectListener { private final String TAG = "ConversationList"; - private final int MENU_MARK_READ = 1; - private final int MENU_MARK_UNREAD = 2; - private final int MENU_DELETE_FAILED = 3; - private final int MENU_DELETE_CONVERSATION = 4; - private final int MENU_MULTI_SELECT = 5; - private final int MENU_BLOCK_CONVERSATION = 6; - private final int MENU_UNBLOCK_CONVERSATION = 7; - @Bind(R.id.empty_state) View mEmptyState; @Bind(R.id.empty_state_icon) ImageView mEmptyStateIcon; @Bind(R.id.conversations_list) RecyclerView mRecyclerView; @@ -128,6 +117,25 @@ public class ConversationListFragment extends QKFragment implements LoaderManage if (mAdapter.isInMultiSelectMode()) { inflater.inflate(R.menu.conversations_selection, menu); mContext.setTitle(getString(R.string.title_conversations_selected, mAdapter.getSelectedItems().size())); + + menu.findItem(R.id.menu_block).setVisible(mPrefs.getBoolean(SettingsFragment.BLOCKED_ENABLED, false)); + + int unreadWeight = 0; + int blockedWeight = 0; + boolean someHaveErrors = false; + for (Conversation conversation : mAdapter.getSelectedItems().values()) { + unreadWeight += conversation.hasUnreadMessages() ? 1 : -1; + blockedWeight += BlockedConversationHelper.isConversationBlocked(mPrefs, conversation.getThreadId()) ? 1 : -1; + + if (conversation.hasError()) { + someHaveErrors = true; + } + } + + menu.findItem(R.id.menu_mark_read).setIcon(unreadWeight >= 0 ? R.drawable.ic_read : R.drawable.ic_unread); + menu.findItem(R.id.menu_mark_read).setTitle(unreadWeight >= 0 ? R.string.menu_mark_read : R.string.menu_mark_unread); + menu.findItem(R.id.menu_block).setTitle(blockedWeight > 0 ? R.string.menu_unblock_conversations : R.string.menu_block_conversations); + menu.findItem(R.id.menu_delete_failed).setVisible(someHaveErrors); } else { inflater.inflate(R.menu.conversations, menu); mContext.setTitle(mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list); @@ -142,19 +150,58 @@ public class ConversationListFragment extends QKFragment implements LoaderManage @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { + case R.id.menu_blocked: + setShowingBlocked(!mShowBlocked); + return true; + case R.id.menu_delete: - DialogHelper.showDeleteConversationsDialog((MainActivity) mContext, mAdapter); + DialogHelper.showDeleteConversationsDialog((MainActivity) mContext, mAdapter.getSelectedItems().keySet()); return true; case R.id.menu_mark_read: - for (long threadId : mAdapter.getSelectedItems()) { - new ConversationLegacy(mContext, threadId).markRead(); + int unreadWeight = 0; + for (Conversation conversation : mAdapter.getSelectedItems().values()) { + unreadWeight += conversation.hasUnreadMessages() ? 1 : -1; + } + for (long threadId : mAdapter.getSelectedItems().keySet()) { + if (unreadWeight >= 0) { + new ConversationLegacy(mContext, threadId).markRead(); + } else { + new ConversationLegacy(mContext, threadId).markUnread(); + } } mAdapter.disableMultiSelectMode(true); return true; - case R.id.menu_blocked: - setShowingBlocked(!mShowBlocked); + case R.id.menu_block: + int blockedWeight = 0; + for (Conversation conversation : mAdapter.getSelectedItems().values()) { + blockedWeight += BlockedConversationHelper.isConversationBlocked(mPrefs, conversation.getThreadId()) ? 1 : -1; + } + for (long threadId : mAdapter.getSelectedItems().keySet()) { + if (blockedWeight > 0) { + BlockedConversationHelper.unblockConversation(mPrefs, threadId); + } else { + BlockedConversationHelper.blockConversation(mPrefs, threadId); + } + } + mAdapter.disableMultiSelectMode(true); + initLoaderManager(); + return true; + + case R.id.menu_delete_failed: + DialogHelper.showDeleteFailedMessagesDialog((MainActivity) mContext, mAdapter.getSelectedItems().keySet()); + mAdapter.disableMultiSelectMode(true); + return true; + + case R.id.menu_select_all: + return true; + + case R.id.menu_deselect_all: + return true; + + case R.id.menu_done: + mAdapter.disableMultiSelectMode(true); return true; } @@ -175,7 +222,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage @Override public void onItemClick(Conversation conversation, View view) { if (mAdapter.isInMultiSelectMode()) { - mAdapter.toggleSelection(conversation.getThreadId()); + mAdapter.toggleSelection(conversation.getThreadId(), conversation); } else { ((MainActivity) mContext).setConversation(conversation.getThreadId(), -1, null, true); } @@ -183,76 +230,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage @Override public void onItemLongClick(final Conversation conversation, View view) { - if (mAdapter.isInMultiSelectMode()) { - mAdapter.toggleSelection(conversation.getThreadId()); - return; - } - - final long threadId = conversation.getThreadId(); - final String name = conversation.getRecipients().formatNames(", "); - - final QKDialog dialog = new QKDialog() - .setContext(mContext) - .setTitle(name); - - if (!mAdapter.isInMultiSelectMode()) { - dialog.addMenuItem(R.string.menu_multi_select, MENU_MULTI_SELECT); - } - - if (mPrefs.getBoolean(SettingsFragment.BLOCKED_ENABLED, false)) { - if (BlockedConversationHelper.isConversationBlocked(mPrefs, conversation.getThreadId())) { - dialog.addMenuItem(R.string.menu_unblock_conversation, MENU_UNBLOCK_CONVERSATION); - } else { - dialog.addMenuItem(R.string.menu_block_conversation, MENU_BLOCK_CONVERSATION); - } - } - - if (conversation.hasUnreadMessages()) { - dialog.addMenuItem(R.string.menu_mark_read, MENU_MARK_READ); - } else { - dialog.addMenuItem(R.string.menu_mark_unread, MENU_MARK_UNREAD); - } - - if (conversation.hasError()) { - dialog.addMenuItem(R.string.delete_all_failed, MENU_DELETE_FAILED); - } - - dialog.addMenuItem(R.string.menu_delete_conversation, MENU_DELETE_CONVERSATION); - - dialog.buildMenu((parent, view1, position, id) -> { - switch ((int) id) { - case MENU_BLOCK_CONVERSATION: - BlockedConversationHelper.blockConversation(mPrefs, conversation.getThreadId()); - initLoaderManager(); - break; - - case MENU_UNBLOCK_CONVERSATION: - BlockedConversationHelper.unblockConversation(mPrefs, conversation.getThreadId()); - initLoaderManager(); - break; - - case MENU_MARK_READ: - new ConversationLegacy(mContext, threadId).markRead(); - break; - - case MENU_MARK_UNREAD: - new ConversationLegacy(mContext, threadId).markUnread(); - break; - - case MENU_MULTI_SELECT: - mAdapter.setSelected(threadId); - break; - - case MENU_DELETE_CONVERSATION: - DialogHelper.showDeleteConversationDialog((MainActivity) mContext, threadId); - break; - - case MENU_DELETE_FAILED: - //Deletes all failed messages from all conversations - DialogHelper.showDeleteFailedMessagesDialog((MainActivity) mContext, threadId); - break; - } - }).show(mContext.getFragmentManager(), "conversation options"); + mAdapter.toggleSelection(conversation.getThreadId(), conversation); } public void setPosition(int position) { @@ -325,11 +303,12 @@ public class ConversationListFragment extends QKFragment implements LoaderManage @Override public void onItemAdded(long id) { - mContext.setTitle(getString(R.string.title_conversations_selected, mAdapter.getSelectedItems().size())); + mContext.invalidateOptionsMenu(); } @Override public void onItemRemoved(long id) { - mContext.setTitle(getString(R.string.title_conversations_selected, mAdapter.getSelectedItems().size())); + mContext.invalidateOptionsMenu(); } + } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index 3bd8ab5e..ff90ceba 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -337,7 +337,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa @Override public void onItemClick(final MessageItem messageItem, View view) { if (mAdapter.isInMultiSelectMode()) { - mAdapter.toggleSelection(messageItem.getMessageId()); + mAdapter.toggleSelection(messageItem.getMessageId(), messageItem); } else { if (view.getId() == R.id.image_view || view.getId() == R.id.play_slideshow_button) { switch (messageItem.mAttachmentType) { diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_unread.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_unread_indicator.png similarity index 100% rename from QKSMS/src/main/res/drawable-xxhdpi/ic_unread.png rename to QKSMS/src/main/res/drawable-xxhdpi/ic_unread_indicator.png diff --git a/QKSMS/src/main/res/drawable/ic_read.xml b/QKSMS/src/main/res/drawable/ic_read.xml new file mode 100644 index 00000000..05b0339e --- /dev/null +++ b/QKSMS/src/main/res/drawable/ic_read.xml @@ -0,0 +1,9 @@ + + + diff --git a/QKSMS/src/main/res/drawable/ic_unread.xml b/QKSMS/src/main/res/drawable/ic_unread.xml new file mode 100644 index 00000000..e7a87728 --- /dev/null +++ b/QKSMS/src/main/res/drawable/ic_unread.xml @@ -0,0 +1,9 @@ + + + diff --git a/QKSMS/src/main/res/layout/activity_welcome.xml b/QKSMS/src/main/res/layout/activity_welcome.xml index e1af9a8b..6a65be2c 100644 --- a/QKSMS/src/main/res/layout/activity_welcome.xml +++ b/QKSMS/src/main/res/layout/activity_welcome.xml @@ -51,7 +51,7 @@ android:layout_height="16dp" android:alpha="1.0" android:padding="4dp" - android:src="@drawable/ic_unread" /> + android:src="@drawable/ic_unread_indicator" /> + android:src="@drawable/ic_unread_indicator" /> + android:src="@drawable/ic_unread_indicator" /> diff --git a/QKSMS/src/main/res/menu/conversations_selection.xml b/QKSMS/src/main/res/menu/conversations_selection.xml index e68df0d5..14bbc6c9 100644 --- a/QKSMS/src/main/res/menu/conversations_selection.xml +++ b/QKSMS/src/main/res/menu/conversations_selection.xml @@ -14,4 +14,24 @@ android:title="@string/menu_mark_read" android:visible="true" app:showAsAction="ifRoom" /> + + + + + + + + + + diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 4b193492..32dd422f 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -417,14 +417,10 @@ Me - Edit - Delete messages - + Delete failed messages Lock - Unlock Unmute conversation - Block conversation - Unblock conversation + Block conversations + Unblock conversations Messages Blocked Blocked (%s new) @@ -659,6 +655,9 @@ Mark unread Delete conversation Select conversation + Select all + Deselect all + Done Failed message options Attachments app not found. Try installing a photo gallery app!