From 8cad6876f25c77824ecf33993dd2a41f77eb2610 Mon Sep 17 00:00:00 2001 From: AlbrechtRoehm Date: Sat, 21 Jan 2017 19:16:45 +0100 Subject: [PATCH] Start to add titles, replace customTitle() --- Habitica/res/values/strings.xml | 2 ++ .../android/habitica/ui/activities/MainActivity.java | 7 ++++++- .../habitica/ui/fragments/faq/FAQOverviewFragment.java | 5 +++++ .../habitica/ui/fragments/social/GuildFragment.java | 5 +++++ .../habitica/ui/fragments/social/InboxFragment.java | 5 +++++ .../ui/fragments/social/InboxMessageListFragment.java | 4 +++- .../habitica/ui/fragments/social/TavernFragment.java | 5 +++++ 7 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index be209b97e..863adaf99 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -471,4 +471,6 @@ To start, which parts of your life do you want to improve? Warning Open Settings It seems like you have the Developer option \"Don\'t keep Activities\" active. Currently this option causes issues with the habitica app, so we suggest disabling it. + Inbox + Frequently Asked Questions diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java index 5a2a7abb3..c31122e2e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java @@ -879,11 +879,16 @@ public class MainActivity extends BaseActivity implements Action1, Ha public void setActiveFragment(BaseMainFragment fragment) { this.activeFragment = fragment; + + if(fragment.customTitle() != null){ getSupportActionBar().setTitle(fragment.customTitle()); // BUG: setTitle not changed the title, just switched the length of "username" //setTitle(fragment.customTitle()); + Log.e(getClass().getSimpleName(), fragment.customTitle()); } else { + + Log.e(getClass().getSimpleName(), "User is set"); setUserTitle(); } @@ -892,7 +897,7 @@ public class MainActivity extends BaseActivity implements Action1, Ha private void setUserTitle(){ if(user != null && user.getProfile() != null){ - setTitle(user.getProfile().getName()); + getSupportActionBar().setTitle(user.getProfile().getName()); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java index ed8bade08..d113336dc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java @@ -58,4 +58,9 @@ public class FAQOverviewFragment extends BaseMainFragment { adapter.setArticles(articles); } + + @Override + public String customTitle() { + return getString(R.string.FAQ); + } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java index 3b2cb5eaf..0ef23b929 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java @@ -252,4 +252,9 @@ public class GuildFragment extends BaseMainFragment implements Action1 { } this.activity.supportInvalidateOptionsMenu(); } + + @Override + public String customTitle() { + return getString(R.string.guild); + } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java index 0ecd705b3..234e2b9d4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java @@ -205,4 +205,9 @@ public class InboxFragment extends BaseMainFragment } } } + + @Override + public String customTitle() { + return getString(R.string.inbox); + } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java index 5016460b7..08ea3be97 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java @@ -65,7 +65,7 @@ public class InboxMessageListFragment extends BaseMainFragment RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this.getActivity()); chatRecyclerView.setLayoutManager(layoutManager); - chatAdapter = new ChatRecyclerViewAdapter(messages, null, null, false); + chatAdapter = new ChatRecyclerViewAdapter(messages, user, null, false); chatAdapter.setToInboxChat(this.replyToUserUUID); chatAdapter.setSendingUser(this.user); chatRecyclerView.setAdapter(chatAdapter); @@ -134,4 +134,6 @@ public class InboxMessageListFragment extends BaseMainFragment UiUtils.dismissKeyboard(HabiticaApplication.currentActivity); } + + } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java index a6395f648..d19d3e230 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java @@ -133,4 +133,9 @@ public class TavernFragment extends BaseMainFragment { tabLayout.setupWithViewPager(viewPager); } } + + @Override + public String customTitle() { + return getString(R.string.inbox); + } }