sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-17 11:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better indication for when user is not participating in quest

Browse source
This commit is contained in:
Phillip Thelen 2020-02-12 17:21:43 +01:00
parent 68d6ce7425
commit 975dfd7023
4 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -153,7 +153,7 @@ android {
multiDexEnabled true
resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
versionCode 2371
versionCode 2373
versionName "2.5"
}

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

@ -952,4 +952,5 @@
<string name="unlock_level">Unlock by reaching level %d</string>
<string name="unlock_previous_short">Finish Quest %d</string>
<string name="unlock_level_short">Level %d</string>
<string name="not_participating">You are not participating</string>
</resources>

16
Habitica/res/values/values.xml
View file

@ -89,6 +89,14 @@
<item>Rosstavo\'s Theme</item>
<item>Dewin\'s Theme</item>
<item>Airu\'s Theme</item>
<item>Beatscribe\'s NES Theme</item>
<item>Arashi\'s Theme</item>
<item>Triumph Theme</item>
<item>Lunasol Theme</item>
<item>SpacePenguin\'s Theme</item>
<item>MAFL Theme</item>
<item>Pizilden\'s Theme</item>
<item>Farvoid Theme</item>
</string-array>
<string-array name="AudioValues">
@ -100,6 +108,14 @@
<item>rosstavoTheme</item>
<item>dewinTheme</item>
<item>airuTheme</item>
<item>beatscribeNesTheme</item>
<item>arashiTheme</item>
<item>triumphTheme</item>
<item>lunasolTheme</item>
<item>spacePenguinTheme</item>
<item>maflTheme</item>
<item>pizildenTheme</item>
<item>farvoidTheme</item>
</string-array>

11
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
View file

@ -208,11 +208,20 @@ class PartyDetailFragment : BaseFragment() {
} else {
DataBindingUtils.loadImage(questImageView, "quest_" + questContent.key)
}
questImageWrapper?.alpha = 1.0f
questProgressView?.alpha = 1.0f
if (viewModel?.isQuestActive == true) {
questProgressView?.visibility = View.VISIBLE
questProgressView?.setData(questContent, viewModel?.getGroupData()?.value?.quest?.progress)
questParticipationView?.text = context?.getString(R.string.number_participants, viewModel?.getGroupData()?.value?.quest?.members?.size)
val questParticipants = viewModel?.getGroupData()?.value?.quest?.members
if (questParticipants?.find { it.key == userId } != null) {
questParticipationView?.text = context?.getString(R.string.number_participants, questParticipants.size)
} else {
questParticipationView?.text = context?.getString(R.string.not_participating)
questImageWrapper?.alpha = 0.5f
questProgressView?.alpha = 0.5f
}
} else {
questProgressView?.visibility = View.GONE
}