Update menus, show selected count in toolbar

This commit is contained in:
Moez Bhatti
2015-10-31 01:29:23 -04:00
parent 38ee1de915
commit 9ae752322e
6 changed files with 64 additions and 37 deletions
@@ -3,6 +3,7 @@ package com.moez.QKSMS.ui.base;
import android.database.Cursor; import android.database.Cursor;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.View; import android.view.View;
import com.moez.QKSMS.common.utils.CursorUtils; import com.moez.QKSMS.common.utils.CursorUtils;
import java.util.ArrayList; import java.util.ArrayList;
@@ -18,6 +19,10 @@ public abstract class RecyclerCursorAdapter<VH extends RecyclerView.ViewHolder,
public interface MultiSelectListener { public interface MultiSelectListener {
void onMultiSelectStateChanged(boolean enabled); void onMultiSelectStateChanged(boolean enabled);
void onItemAdded(long id);
void onItemRemoved(long id);
} }
protected QKActivity mContext; protected QKActivity mContext;
@@ -98,8 +103,12 @@ public abstract class RecyclerCursorAdapter<VH extends RecyclerView.ViewHolder,
mSelectedItems.add(threadId); mSelectedItems.add(threadId);
notifyDataSetChanged(); notifyDataSetChanged();
if (mSelectedItems.size() == 1 && mMultiSelectListener != null) { if (mMultiSelectListener != null) {
mMultiSelectListener.onMultiSelectStateChanged(true); mMultiSelectListener.onItemAdded(threadId);
if (mSelectedItems.size() == 1) {
mMultiSelectListener.onMultiSelectStateChanged(true);
}
} }
} }
} }
@@ -109,8 +118,12 @@ public abstract class RecyclerCursorAdapter<VH extends RecyclerView.ViewHolder,
mSelectedItems.remove(threadId); mSelectedItems.remove(threadId);
notifyDataSetChanged(); notifyDataSetChanged();
if (mSelectedItems.size() == 0 && mMultiSelectListener != null) { if (mMultiSelectListener != null) {
mMultiSelectListener.onMultiSelectStateChanged(false); mMultiSelectListener.onItemRemoved(threadId);
if (mSelectedItems.size() == 0) {
mMultiSelectListener.onMultiSelectStateChanged(false);
}
} }
} }
} }
@@ -125,26 +125,16 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
} }
public void inflateToolbar(Menu menu, MenuInflater inflater, Context context) { public void inflateToolbar(Menu menu, MenuInflater inflater, Context context) {
inflater.inflate(R.menu.coversation_list, menu); if (mAdapter.isInMultiSelectMode()) {
mContext.setTitle(mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list); inflater.inflate(R.menu.conversations_selection, menu);
mContext.setTitle(getString(R.string.title_conversations_selected, mAdapter.getSelectedItems().size()));
// Make sure we're only touching the conversation menu
if (menu.findItem(R.id.menu_search) != null) {
if (mAdapter.isInMultiSelectMode()) {
menu.findItem(R.id.menu_search).setVisible(false);
menu.findItem(R.id.menu_delete).setVisible(true);
menu.findItem(R.id.menu_mark_read).setVisible(true);
} else {
menu.findItem(R.id.menu_search).setVisible(true);
menu.findItem(R.id.menu_delete).setVisible(false);
menu.findItem(R.id.menu_mark_read).setVisible(false);
}
} else { } else {
mAdapter.disableMultiSelectMode(false); inflater.inflate(R.menu.conversations, menu);
} mContext.setTitle(mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list);
mBlockedItem = menu.findItem(R.id.menu_blocked); mBlockedItem = menu.findItem(R.id.menu_blocked);
BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked); BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked);
}
super.onCreateOptionsMenu(menu, inflater); super.onCreateOptionsMenu(menu, inflater);
} }
@@ -330,6 +320,16 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
@Override @Override
public void onMultiSelectStateChanged(boolean enabled) { public void onMultiSelectStateChanged(boolean enabled) {
getActivity().invalidateOptionsMenu(); mContext.invalidateOptionsMenu();
}
@Override
public void onItemAdded(long id) {
mContext.setTitle(getString(R.string.title_conversations_selected, mAdapter.getSelectedItems().size()));
}
@Override
public void onItemRemoved(long id) {
mContext.setTitle(getString(R.string.title_conversations_selected, mAdapter.getSelectedItems().size()));
} }
} }
@@ -825,6 +825,16 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
} }
@Override
public void onItemAdded(long id) {
}
@Override
public void onItemRemoved(long id) {
}
private class DeleteMessageListener implements DialogInterface.OnClickListener { private class DeleteMessageListener implements DialogInterface.OnClickListener {
private final MessageItem mMessageItem; private final MessageItem mMessageItem;
@@ -7,20 +7,6 @@
android:title="@string/menu_search" android:title="@string/menu_search"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_delete"
android:icon="@drawable/ic_delete"
android:title="@string/menu_delete"
android:visible="false"
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_mark_read"
android:icon="@drawable/ic_accept"
android:title="@string/menu_mark_read"
android:visible="false"
app:showAsAction="ifRoom" />
<item <item
android:id="@+id/menu_settings" android:id="@+id/menu_settings"
android:title="@string/menu_settings" /> android:title="@string/menu_settings" />
@@ -0,0 +1,17 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_delete"
android:icon="@drawable/ic_delete"
android:title="@string/menu_delete"
android:visible="true"
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_mark_read"
android:icon="@drawable/ic_accept"
android:title="@string/menu_mark_read"
android:visible="true"
app:showAsAction="ifRoom" />
</menu>
+1
View File
@@ -314,6 +314,7 @@
<string name="title_qk_responses">QK Responses</string> <string name="title_qk_responses">QK Responses</string>
<string name="title_block_address">Block number</string> <string name="title_block_address">Block number</string>
<string name="title_unblock_address">Unblock number</string> <string name="title_unblock_address">Unblock number</string>
<string name="title_conversations_selected">(%s) Conversations</string>
<!-- Menu shown in the context menu when long pressing on a message when the message contains <!-- Menu shown in the context menu when long pressing on a message when the message contains
one or more phone numbers and/or email addresses and the number or email is new to one or more phone numbers and/or email addresses and the number or email is new to