diff --git a/Habitica/res/layout/drawer_main_item.xml b/Habitica/res/layout/drawer_main_item.xml
index f866b557a..55f4b487a 100644
--- a/Habitica/res/layout/drawer_main_item.xml
+++ b/Habitica/res/layout/drawer_main_item.xml
@@ -1,22 +1,33 @@
-
-
+
-
+ android:orientation="vertical">
+
+
+
-
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 5f2ef75b4..2851fddd1 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -856,5 +856,6 @@
Your gifted subscription was sent and your subscription applied to your account.
Your gifted subscription was sent and your subscription applied to your account.
Discover
+ Damage paused
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
index 414a0293f..179f7c558 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
@@ -129,7 +129,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): android
val pR = pillView.paddingRight
val pB = pillView.paddingBottom
- pillView.backgroundCompat = ContextCompat.getDrawable(itemView.context, R.drawable.pill_bg_purple_300)
+ pillView.backgroundCompat = ContextCompat.getDrawable(itemView.context, R.drawable.pill_bg_purple_200)
pillView.setTextColor(ContextCompat.getColor(itemView.context, R.color.white))
pillView.setPadding(pL, pT, pR, pB)
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index c8c229a23..2e623e401 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments
import android.app.ActionBar
-import android.content.Intent
import android.os.Bundle
import android.view.Gravity
import android.view.LayoutInflater
@@ -21,25 +20,9 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.inventory.Quest
import com.habitrpg.android.habitica.models.inventory.QuestContent
import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.ui.activities.AboutActivity
-import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity
import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.activities.PrefsActivity
import com.habitrpg.android.habitica.ui.adapter.NavigationDrawerAdapter
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment
-import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment
-import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment
-import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment
-import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment
-import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment
-import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment
-import com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment
-import com.habitrpg.android.habitica.ui.fragments.social.InboxFragment
import com.habitrpg.android.habitica.ui.fragments.social.TavernDetailFragment
-import com.habitrpg.android.habitica.ui.fragments.social.TavernFragment
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragment
-import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment
-import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment
import com.habitrpg.android.habitica.ui.helpers.NavbarUtils
import com.habitrpg.android.habitica.ui.menu.HabiticaDrawerItem
import io.reactivex.disposables.CompositeDisposable
@@ -199,6 +182,12 @@ class NavigationDrawerFragment : DialogFragment() {
setDisplayName(it.profile?.name)
avatarView.setAvatar(it)
questMenuView.configure(it)
+ val tavernItem = adapter.items.find { item -> item.identifier == SIDEBAR_TAVERN }
+ if (it.preferences?.sleep == true) {
+ tavernItem?.additionalInfo = context?.getString(R.string.damage_paused)
+ } else {
+ tavernItem?.additionalInfo = null
+ }
}, RxErrorHandler.handleEmptyError()))
messagesButtonWrapper.setOnClickListener { setSelection(R.id.inboxFragment) }
@@ -220,7 +209,7 @@ class NavigationDrawerFragment : DialogFragment() {
items.add(HabiticaDrawerItem(R.id.skillsFragment, SIDEBAR_SKILLS, context.getString(R.string.sidebar_skills)))
items.add(HabiticaDrawerItem(R.id.statsFragment, SIDEBAR_STATS, context.getString(R.string.sidebar_stats)))
items.add(HabiticaDrawerItem(0, SIDEBAR_SOCIAL, context.getString(R.string.sidebar_section_social), true))
- items.add(HabiticaDrawerItem(R.id.tavernFragment, SIDEBAR_TAVERN, context.getString(R.string.sidebar_tavern)))
+ items.add(HabiticaDrawerItem(R.id.tavernFragment, SIDEBAR_TAVERN, context.getString(R.string.sidebar_tavern), false, false))
items.add(HabiticaDrawerItem(R.id.partyFragment, SIDEBAR_PARTY, context.getString(R.string.sidebar_party)))
items.add(HabiticaDrawerItem(R.id.guildsOverviewFragment, SIDEBAR_GUILDS, context.getString(R.string.sidebar_guilds)))
items.add(HabiticaDrawerItem(R.id.challengesOverviewFragment, SIDEBAR_CHALLENGES, context.getString(R.string.sidebar_challenges)))