From 216f58f24bdb3fb7c0536dbb2e914b22d860d277 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 31 Oct 2015 16:21:42 -0400 Subject: [PATCH] Update views for selection mode state --- .../ConversationListFragment.java | 23 ++++++++++++------- QKSMS/src/main/res/values/strings.xml | 10 +------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java index dc819fd0..d2313055 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java @@ -20,8 +20,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import butterknife.Bind; -import butterknife.ButterKnife; + import com.melnykov.fab.FloatingActionButton; import com.moez.QKSMS.R; import com.moez.QKSMS.common.BlockedConversationHelper; @@ -41,6 +40,9 @@ import com.moez.QKSMS.ui.base.RecyclerCursorAdapter; import com.moez.QKSMS.ui.compose.ComposeFragment; import com.moez.QKSMS.ui.settings.SettingsFragment; +import butterknife.Bind; +import butterknife.ButterKnife; + public class ConversationListFragment extends QKFragment implements LoaderManager.LoaderCallbacks, LiveView, RecyclerCursorAdapter.ItemClickListener, RecyclerCursorAdapter.MultiSelectListener { @@ -97,13 +99,17 @@ public class ConversationListFragment extends QKFragment implements LoaderManage mFab.attachToRecyclerView(mRecyclerView); mFab.getDrawable().setColorFilter(new PorterDuffColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.MULTIPLY)); mFab.setOnClickListener(v -> { - // Show the compose fragment, showing the keyboard and focusing on the recipients edittext. - Bundle args = new Bundle(); - args.putBoolean(ComposeFragment.ARG_SHOW_KEYBOARD, true); - args.putString(ComposeFragment.ARG_FOCUS, ComposeFragment.FOCUS_RECIPIENTS); + if (mAdapter.isInMultiSelectMode()) { + mAdapter.disableMultiSelectMode(true); + } else { + // Show the compose fragment, showing the keyboard and focusing on the recipients edittext. + Bundle args = new Bundle(); + args.putBoolean(ComposeFragment.ARG_SHOW_KEYBOARD, true); + args.putString(ComposeFragment.ARG_FOCUS, ComposeFragment.FOCUS_RECIPIENTS); - Fragment content = getFragmentManager().findFragmentById(R.id.content_frame); - switchFragment(ComposeFragment.getInstance(args, content)); + Fragment content = getFragmentManager().findFragmentById(R.id.content_frame); + switchFragment(ComposeFragment.getInstance(args, content)); + } }); mViewHasLoaded = true; @@ -308,6 +314,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage @Override public void onMultiSelectStateChanged(boolean enabled) { mContext.invalidateOptionsMenu(); + mFab.setImageResource(enabled ? R.drawable.ic_accept : R.drawable.ic_add); } @Override diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 10bc16eb..23591ee8 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -295,26 +295,18 @@ Buy me lunch - Settings - Search - Compose - Conversations Blocked - Changelog - New messages - Donate - QK Responses Block number Unblock number - (%s) Conversations + %s selected