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

finish up 3.2

Browse source
This commit is contained in:
Phillip Thelen 2021-02-22 09:43:15 +01:00
parent f3eefa5712
commit b8dac6c75c
4 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -150,7 +150,7 @@ android {
buildConfigField "String", "TESTING_LEVEL", "\"production\""
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 2824
versionCode 2835
versionName "3.2"
}

2
Habitica/res/values-lt/strings.xml
View file

@ -304,7 +304,7 @@
<string name="task_setup_description">Puikus! Dabar, ką domitės dirbti visą šią kelionę\?</string>
<string name="setup_group_health">Sveikata</string>
<string name="add_tag">Pridėti naują žymę</string>
<string name="quest_begin_message">Ar tu tuo tikras\? Tik% 1 $d jūsų% 2 $d partijos narių prisijungė prie šio Quest! Užklausos prasideda automatiškai, kai visi žaidėjai prisijungė arba atmetė kvietimą.</string>
<string name="quest_begin_message">Ar tu tuo tikras\? Tik%1$d jūsų%2$d partijos narių prisijungė prie šio Quest! Užklausos prasideda automatiškai, kai visi žaidėjai prisijungė arba atmetė kvietimą.</string>
<string name="ago_1day">Prieš 1 dieną</string>
<string name="ago_days">prieš %d dienas</string>
<string name="ago_1Minute">Prieš 1 minutę</string>

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

@ -1,5 +1,6 @@
package com.habitrpg.android.habitica.ui.fragments.social
import android.annotation.SuppressLint
import android.app.AlertDialog
import android.content.Context
import android.os.Bundle
@ -104,7 +105,7 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
}, RxErrorHandler.handleEmptyError()))
if (binding?.questResponseWrapper != null) {
if (userId != party?.quest?.leader && showParticipatantButtons()) {
if (userId != party?.quest?.leader && user?.party?.quest?.key == group.quest?.key && user?.party?.quest?.RSVPNeeded == false) {
binding?.questLeaveButton?.visibility = View.VISIBLE
} else {
binding?.questLeaveButton?.visibility = View.GONE
@ -127,13 +128,6 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
return userId == party?.quest?.leader || userId == party?.leaderID
}
private fun showParticipatantButtons(): Boolean {
return if (user?.party?.quest == null) {
false
} else party?.quest?.participants?.find { it.id == user?.id } != null
}
private fun updateQuestContent(questContent: QuestContent) {
if (binding?.titleView == null || !questContent.isManaged) {
return
@ -193,8 +187,9 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
binding?.participantsHeaderCount?.text = participantCount.toString()
} else {
binding?.participantsHeader?.setText(R.string.invitations)
binding?.participantsHeaderCount?.text = participantCount.toString() + "/" + quest?.participants?.size
beginQuestMessage = getString(R.string.quest_begin_message, participantCount, quest?.participants?.size)
@SuppressLint("SetTextI18n")
binding?.participantsHeaderCount?.text = participantCount.toString() + "/" + participants?.size
beginQuestMessage = getString(R.string.quest_begin_message, participantCount, participants?.size)
}
}

2
Habitica/staff/release/output-metadata.json
View file

@ -10,7 +10,7 @@
{
"type": "SINGLE",
"filters": [],
"versionCode": 2824,
"versionCode": 2828,
"versionName": "3.2",
"outputFile": "Habitica-staff-release.apk"
}