From 10a95ee9afff403d6d0e291bb2ce4496fd29c006 Mon Sep 17 00:00:00 2001 From: AlbrechtRoehm Date: Sun, 22 Jan 2017 16:51:17 +0100 Subject: [PATCH] fix_#700_titleAlwaysChallenge add customTitle() for all the fragments to display title according to the current fragmet --- .../habitica/ui/activities/MainActivity.java | 35 ++++++------------- .../habitica/ui/fragments/NewsFragment.java | 4 +++ .../customization/AvatarOverviewFragment.java | 4 +++ .../equipment/EquipmentOverviewFragment.java | 4 +++ .../inventory/items/ItemsFragment.java | 4 +++ .../inventory/shops/ShopsFragment.java | 5 +++ .../stable/MountDetailRecyclerFragment.java | 3 ++ .../stable/PetDetailRecyclerFragment.java | 3 ++ .../inventory/stable/StableFragment.java | 4 +++ .../ui/fragments/skills/SkillsFragment.java | 4 +++ .../social/GuildsOverviewFragment.java | 4 +++ .../ui/fragments/social/InboxFragment.java | 2 +- .../social/PublicGuildsFragment.java | 3 ++ .../ui/fragments/social/TavernFragment.java | 4 +-- .../challenges/ChallengeListFragment.java | 3 ++ .../fragments/social/party/PartyFragment.java | 5 +++ .../ui/fragments/tasks/TasksFragment.java | 4 +++ 17 files changed, 67 insertions(+), 28 deletions(-) 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 c31122e2e..529402427 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 @@ -1,6 +1,5 @@ package com.habitrpg.android.habitica.ui.activities; -import com.facebook.drawee.generic.RootDrawable; import com.facebook.drawee.view.SimpleDraweeView; import com.habitrpg.android.habitica.APIHelper; import com.habitrpg.android.habitica.HabiticaApplication; @@ -119,9 +118,6 @@ import android.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.drawable.BitmapDrawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -133,7 +129,6 @@ import android.support.v4.content.FileProvider; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Gravity; @@ -806,7 +801,7 @@ public class MainActivity extends BaseActivity implements Action1, Ha private void updateHeader() { updateUserAvatars(); - setUserTitle(); + setTranslatedFragmentTitle(activeFragment); android.support.v7.app.ActionBarDrawerToggle actionBarDrawerToggle = drawer.getActionBarDrawerToggle(); @@ -878,27 +873,19 @@ 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(); - } - + setTranslatedFragmentTitle(fragment); this.drawer.setSelectionAtPosition(this.activeFragment.fragmentSidebarPosition, false); } - private void setUserTitle(){ - if(user != null && user.getProfile() != null){ - getSupportActionBar().setTitle(user.getProfile().getName()); - } + private void setTranslatedFragmentTitle(BaseMainFragment fragment){ + if(fragment!= null && fragment.customTitle() != null){ + getSupportActionBar().setTitle(fragment.customTitle()); + } + else{ + if(user != null && user.getProfile() != null){ + getSupportActionBar().setTitle(user.getProfile().getName()); + } + } } public void onBackPressed() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java index bf909ded8..5c5633433 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java @@ -38,4 +38,8 @@ public class NewsFragment extends BaseMainFragment { component.inject(this); } + + + @Override + public String customTitle() { return getString(R.string.sidebar_news); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java index 27176b298..96d12848f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java @@ -152,4 +152,8 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV @Override public void onNothingSelected(AdapterView parent) { } + + + @Override + public String customTitle() { return getString(R.string.sidebar_avatar); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java index 5982ba1c2..873fa1360 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java @@ -165,4 +165,8 @@ public class EquipmentOverviewFragment extends BaseMainFragment implements Trans public boolean hasResult(BaseTransaction> transaction, List result) { return true; } + + @Override + public String customTitle() { return getString(R.string.sidebar_equipment); } + } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java index a456a4c12..3f160c98f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java @@ -133,4 +133,8 @@ public class ItemsFragment extends BaseMainFragment { fragment.show(getFragmentManager(), "hatchingDialog"); } } + + + @Override + public String customTitle() { return getString(R.string.sidebar_items); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java index 58aa1b98b..09f5340ec 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java @@ -96,4 +96,9 @@ public class ShopsFragment extends BaseMainFragment { tabLayout.setupWithViewPager(viewPager); } } + + + @Override + public String customTitle() { return getString(R.string.sidebar_shops); } + } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java index 6f0c75258..8f53aa5bc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java @@ -106,4 +106,7 @@ public class MountDetailRecyclerFragment extends BaseMainFragment { itemsRunnable.run(); } + + @Override + public String customTitle() { return getString(R.string.mounts); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java index 1918344d9..1e6113960 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java @@ -130,4 +130,7 @@ public class PetDetailRecyclerFragment extends BaseMainFragment { adapter.setOwnedMapping(user.getItems().getPets()); adapter.setOwnedMountsMapping(user.getItems().getMounts()); } + + @Override + public String customTitle() { return getString(R.string.pets); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java index 8c89704f0..f8bb47065 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java @@ -84,4 +84,8 @@ public class StableFragment extends BaseMainFragment { tabLayout.setupWithViewPager(viewPager); } } + + + @Override + public String customTitle() { return getString(R.string.sidebar_stable); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java index 77b71663f..7197202fd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java @@ -235,4 +235,8 @@ public class SkillsFragment extends BaseMainFragment { return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n)); } + + @Override + public String customTitle() { return getString(R.string.sidebar_skills); } + } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java index 9974eec88..78b422f70 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java @@ -112,4 +112,8 @@ public class GuildsOverviewFragment extends BaseMainFragment implements View.OnC this.activity.displayFragment(guildFragment); } } + + + @Override + public String customTitle() { return getString(R.string.sidebar_guilds); } } 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 234e2b9d4..8a5dd87e9 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 @@ -208,6 +208,6 @@ public class InboxFragment extends BaseMainFragment @Override public String customTitle() { - return getString(R.string.inbox); + return getString(R.string.sidebar_inbox); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java index 71f0d6b95..4ee2b32e6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java @@ -109,4 +109,7 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView viewAdapter.getFilter().filter(s); return true; } + + @Override + public String customTitle() { return getString(R.string.public_guilds); } } 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 d19d3e230..ed90857d4 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 @@ -135,7 +135,5 @@ public class TavernFragment extends BaseMainFragment { } @Override - public String customTitle() { - return getString(R.string.inbox); - } + public String customTitle() { return getString(R.string.sidebar_tavern); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java index a51bb323e..1965df1c0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java @@ -175,4 +175,7 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr public void updateItem(Challenge challenge) { challengeAdapter.replaceChallenge(challenge); } + + @Override + public String customTitle() { return getString(R.string.sidebar_challenges); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java index 3ecd129dd..eff786fc7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java @@ -356,4 +356,9 @@ public class PartyFragment extends BaseMainFragment { tabLayout.setupWithViewPager(viewPager); } } + + + @Override + public String customTitle() { return getString(R.string.sidebar_party); } + } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java index 84b02c3e5..2c2684122 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java @@ -658,4 +658,8 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi .create(); confirmDeleteAlert.show(); } + + + @Override + public String customTitle() { return getString(R.string.sidebar_tasks); } }