diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt index 561896f1b..5c2c304c5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt @@ -105,10 +105,6 @@ abstract class BaseMainFragment : BaseFragment() { super.onSaveInstanceState(outState) } - open fun customTitle(): String { - return "" - } - fun hideToolbar() { activity?.avatarWithBars?.visibility = View.GONE } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt index 95c08bb5b..3200b0302 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.fragments import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -47,9 +46,4 @@ class NewsFragment : BaseMainFragment() { } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_news) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt index d1b7a7367..e444b8896 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt @@ -284,10 +284,4 @@ class StatsFragment: BaseMainFragment() { }, RxErrorHandler.handleEmptyError())) } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_stats) - } - } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt index 0c6be1cad..b4a8cc6df 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt @@ -1,9 +1,6 @@ package com.habitrpg.android.habitica.ui.fragments.faq import android.os.Bundle -import androidx.recyclerview.widget.DividerItemDecoration -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -66,9 +63,4 @@ class FAQOverviewFragment : BaseMainFragment() { compositeSubscription.add(faqRepository.getArticles().subscribe(Consumer { adapter?.setArticles(it) }, RxErrorHandler.handleEmptyError())) } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.FAQ) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt index 540a0b6a1..1342699a5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt @@ -105,9 +105,4 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis override fun onNothingSelected(parent: AdapterView<*>) {} - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_avatar) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt index 84866b6ff..7909ae8c1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt @@ -120,10 +120,4 @@ class EquipmentOverviewFragment : BaseMainFragment() { MainNavigationController.navigate(EquipmentOverviewFragmentDirections.openEquipmentDetail(type, isCostume ?: false, equipped ?: "")) } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_equipment) - } - } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt index cc0f520e7..6ad8add46 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt @@ -2,9 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.items import android.os.Bundle import com.google.android.material.tabs.TabLayout -import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter -import androidx.viewpager.widget.ViewPager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -113,9 +111,4 @@ class ItemsFragment : BaseMainFragment() { } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_items) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt index 4baf3f730..842ac6139 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.shops import android.os.Bundle -import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter import android.view.LayoutInflater import android.view.View @@ -93,12 +92,6 @@ class ShopsFragment : BaseMainFragment() { } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_shops) - } - override fun updateUserData(user: User?) { super.updateUserData(user) updateCurrencyView() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt index a20425be3..4c2fc9df8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt @@ -1,8 +1,6 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.stable import android.os.Bundle -import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,7 +12,6 @@ import com.habitrpg.android.habitica.extensions.notNull import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment -import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragmentArgs import com.habitrpg.android.habitica.ui.helpers.MarginDecoration import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator import com.habitrpg.android.habitica.ui.helpers.bindView @@ -106,12 +103,6 @@ class MountDetailRecyclerFragment : BaseMainFragment() { } } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.mounts) - } - companion object { private const val ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY" } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt index d90ba0630..6e9bf3747 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt @@ -1,8 +1,6 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.stable import android.os.Bundle -import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -125,12 +123,6 @@ class PetDetailRecyclerFragment : BaseMainFragment() { } } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.pets) - } - companion object { private const val ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY" } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt index b24b8d48e..5a1b539a5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt @@ -1,9 +1,7 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.stable import android.os.Bundle -import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter -import androidx.viewpager.widget.ViewPager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -76,9 +74,4 @@ class StableFragment : BaseMainFragment() { } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_stable) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt index 0e9286d67..9c5b35d03 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt @@ -6,8 +6,6 @@ import android.content.Intent import android.graphics.drawable.BitmapDrawable import android.os.Bundle import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.DividerItemDecoration -import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -168,9 +166,4 @@ class SkillsFragment : BaseMainFragment() { progressDialog?.dismiss() } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_skills) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt index 1c9894e6f..054571d8b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter -import androidx.viewpager.widget.ViewPager import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater @@ -227,9 +226,4 @@ class GuildFragment : BaseMainFragment() { this.activity?.invalidateOptionsMenu() } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.guild) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt index 989c10308..f7c01a767 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt @@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments.social import android.content.Context import android.os.Bundle -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -111,11 +110,4 @@ class GuildsOverviewFragment : BaseMainFragment(), View.OnClickListener, android } - override fun customTitle(): String { - return if (isAdded) { - getString(R.string.sidebar_guilds) - } else { - "" - } - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt index f7bae5b08..1cc042f39 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt @@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments.social import android.content.Context import android.os.Bundle -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.appcompat.app.AlertDialog import android.view.* import android.widget.EditText @@ -166,9 +165,4 @@ class InboxFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.Swi MainNavigationController.navigate(InboxFragmentDirections.openInboxDetail(userID, username)) } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_inbox) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt index 9342b9736..0f4bf862a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt @@ -180,7 +180,4 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout } } - override fun customTitle(): String { - return chatRoomUser ?: "" - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt index 4dbedcab5..e3df1fa73 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt @@ -2,9 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments.social import android.os.Bundle import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.DividerItemDecoration -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import androidx.appcompat.widget.SearchView import android.view.* import com.habitrpg.android.habitica.R @@ -95,9 +92,4 @@ class PublicGuildsFragment : BaseMainFragment(), SearchView.OnQueryTextListener return true } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.public_guilds) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt index 130fec3a0..96160715c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt @@ -96,9 +96,4 @@ class TavernFragment : BaseMainFragment() { tabLayout?.setupWithViewPager(viewPager) } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_tavern) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt index 925b33293..c2830a7d4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt @@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.fragments.social.challenges import android.os.Bundle import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter -import androidx.viewpager.widget.ViewPager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -88,9 +87,4 @@ class ChallengesOverviewFragment : BaseMainFragment() { statePagerAdapter?.notifyDataSetChanged() } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.challenges) - } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt index b05e6ad01..a8f4057d8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt @@ -19,7 +19,6 @@ import com.habitrpg.android.habitica.ui.activities.GroupFormActivity import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.fragments.social.ChatFragment -import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment import com.habitrpg.android.habitica.ui.fragments.social.GroupInformationFragment import com.habitrpg.android.habitica.ui.helpers.bindView import com.habitrpg.android.habitica.ui.helpers.resetViews @@ -276,10 +275,4 @@ class PartyFragment : BaseMainFragment() { } - override fun customTitle(): String { - return if (!isAdded) { - "" - } else getString(R.string.sidebar_party) - } - } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt index cf108218d..52e53d675 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt @@ -368,8 +368,6 @@ class TasksFragment : BaseMainFragment() { override val displayedClassName: String? get() = null - override fun customTitle(): String = "" - override fun addToBackStack(): Boolean = false companion object {