From 87f4d31745d4c9c0802edb0dbd4eca325f8a3012 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 17 Sep 2015 22:28:50 -0400 Subject: [PATCH] Update title correctly --- QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java | 2 +- .../QKSMS/ui/conversationlist/ConversationListFragment.java | 5 +++++ QKSMS/src/main/res/values/strings.xml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index 66ca389a..99fe9f41 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -263,7 +263,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.OnOpenListen if (mSlidingMenu.isMenuShowing() || content == null) { getSupportActionBar().setDisplayHomeAsUpEnabled(false); - setTitle(getString(R.string.title_conversation_list)); + setTitle(this.menuFragment.getTitleId()); inflater.inflate(R.menu.coversation_list, menu); } else { 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 191154f6..45134b9b 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 @@ -162,6 +162,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage case R.id.menu_blocked: mShowBlocked = !mShowBlocked; + mContext.setTitle(mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list); BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked); initLoaderManager(); return true; @@ -170,6 +171,10 @@ public class ConversationListFragment extends QKFragment implements LoaderManage return super.onOptionsItemSelected(item); } + public int getTitleId() { + return mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list; + } + @Override public void onItemClick(Conversation conversation, View view) { if (mAdapter.isInMultiSelectMode()) { diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 6bf1ac92..c8199613 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -295,6 +295,7 @@ Compose Conversations + Blocked Changelog