sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-08-01 03:30:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

show world boss modal from menu. Fixes #942

Browse source
This commit is contained in:
Phillip Thelen 2018-02-14 11:51:54 +01:00
parent 672fd8d308
commit d0eb1d98ba
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,13 +23,16 @@
android:background="@drawable/pill_bg_purple_200"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:visibility="visible"
tools:text="Test"
android:visibility="gone"/>
<TextView
android:id="@+id/additionalInfoView"
style="@style/Body1"
android:textSize="12sp"
android:background="@drawable/pill_bg_purple_200"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:visibility="visible"
tools:text="Test"
android:visibility="gone"/>
</LinearLayout>

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

@ -139,10 +139,9 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
pillView?.visibility = View.GONE
val additionalInfoView = this.additionalInfoView
if (additionalInfoView != null) {
additionalInfoView.text = drawerItem.additionalInfo
additionalInfoView.visibility = View.VISIBLE
additionalInfoView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.transparent))
additionalInfoView.setTextColor(tintColor)
additionalInfoView.setPadding(0, 0, 0,0)
}
}
}

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

@ -36,6 +36,7 @@ import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragmen
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
@ -43,6 +44,7 @@ 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 kotlinx.android.synthetic.main.drawer_main.*
import kotlinx.android.synthetic.main.fragment_tavern_detail.*
import rx.functions.Action1
import rx.subscriptions.CompositeSubscription
import javax.inject.Inject
@ -126,6 +128,13 @@ class NavigationDrawerFragment : DialogFragment() {
it.additionalInfoAsPill = false
}
adapter.notifyDataSetChanged()
questMenuView.setOnClickListener {
val context = this.context
if (context != null) {
TavernDetailFragment.showWorldBossInfoDialog(context, questContent)
}
}
}
override fun onCreate(savedInstanceState: Bundle?) {

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
View file

@ -198,7 +198,7 @@ class TavernDetailFragment : BaseFragment() {
companion object {
private fun showWorldBossInfoDialog(context: Context, quest: QuestContent) {
fun showWorldBossInfoDialog(context: Context, quest: QuestContent) {
val alert = HabiticaAlertDialog(context)
val bossName = quest.boss.name ?: ""
alert.setTitle(R.string.world_boss_description_title)