sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Display if user has damage paused in main menu

Browse source
This commit is contained in:
Phillip Thelen 2019-01-08 16:14:09 +01:00
parent 415de5e2ff
commit 7e43b261b1
4 changed files with 34 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Habitica/res/layout/drawer_main_item.xml
View file

@ -1,22 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingLeft="@dimen/drawer_padding"
android:paddingRight="@dimen/drawer_padding"
android:gravity="center_vertical">
<TextView
android:id="@+id/titleTextView"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingLeft="@dimen/drawer_padding"
android:paddingRight="@dimen/drawer_padding"
android:gravity="center_vertical">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
style="@style/Body1"
android:textColor="@color/gray_50"
tools:text="Tasks"/>
android:orientation="vertical">
<TextView
android:id="@+id/titleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Body1"
android:textColor="@color/gray_50"
tools:text="Tasks"/>
<TextView
android:id="@+id/additionalInfoView"
android:textSize="11sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:visibility="visible"
tools:text="Test"
android:visibility="gone"/>
</LinearLayout>
<TextView
android:id="@+id/pillView"
style="@style/Pill.Selected"
@ -26,12 +37,4 @@
tools:visibility="visible"
tools:text="Test"
android:visibility="gone"/>
<TextView
android:id="@+id/additionalInfoView"
android:textSize="12sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:visibility="visible"
tools:text="Test"
android:visibility="gone"/>
</LinearLayout>

1
Habitica/res/values/strings.xml
View file

@ -856,5 +856,6 @@
<string name="gift_confirmation_text_g1g1">Your gifted subscription was sent and your subscription applied to your account.</string>
<string name="gift_confirmation_text">Your gifted subscription was sent and your subscription applied to your account.</string>
<string name="discover">Discover</string>
<string name="damage_paused">Damage paused</string>
</resources>

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
View file

@ -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)
}

25
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
View file

@ -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)))